| commit | ecae1ffd7719a60e471550436f885299d27de7df | [log] [tgz] |
|---|---|---|
| author | Tenghui Zhu <ztenghui@android.com> | Mon Jun 16 17:18:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 17:18:51 2014 +0000 |
| tree | 6ecbeef86283bd3518fe14e02fd4b3fbb2f2ba89 | |
| parent | 8197cc403ae93cb980fae4af68d780293458a5fb [diff] | |
| parent | df36dd200c55a6ad463b46bab0ffff49d21206ff [diff] |
am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" * commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff': update parameters in uploadToTexture() for GLES20