tree 6ecbeef86283bd3518fe14e02fd4b3fbb2f2ba89
parent 8197cc403ae93cb980fae4af68d780293458a5fb
parent df36dd200c55a6ad463b46bab0ffff49d21206ff
author Tenghui Zhu <ztenghui@android.com> 1402939131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402939131 +0000

am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20"

* commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff':
  update parameters in uploadToTexture() for GLES20