| commit | 4bc9daedf7c21c4138873840741bad4082a079bc | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Thu Jul 14 10:56:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 14 10:56:11 2011 -0700 |
| tree | fa036019993cdab49be6c1182b44ebf4a0fe3dac | |
| parent | 223bdd176697a0a28661f9650c27744948b29d8f [diff] | |
| parent | 922d5aa97cd7a5ba7cb164c34e1974330edfd5e7 [diff] |
am 922d5aa9: am 1d01f3d2: am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" * commit '922d5aa97cd7a5ba7cb164c34e1974330edfd5e7': opengles emulator: support NULL as parameter to glTexImage2D (gles1)