| commit | df36dd200c55a6ad463b46bab0ffff49d21206ff | [log] [tgz] |
|---|---|---|
| author | Tenghui Zhu <ztenghui@android.com> | Mon Jun 16 17:13:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 17:13:53 2014 +0000 |
| tree | 7881bfd7563881390eb4914efc199517edf66d57 | |
| parent | 080671c5383f4b98303c143a685b9f5e75cfe781 [diff] | |
| parent | 386caf6c8f276f1d03ea077bc799df2a937ef500 [diff] |
am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" * commit '386caf6c8f276f1d03ea077bc799df2a937ef500': update parameters in uploadToTexture() for GLES20