| commit | 922d5aa97cd7a5ba7cb164c34e1974330edfd5e7 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Thu Jul 14 09:18:06 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 14 09:18:06 2011 -0700 |
| tree | d20e551bfa2879bf8ce93decb30dd0a3dc2b7e34 | |
| parent | 288151c64eca5b357c0578eb0e9f9769d2cd9c6d [diff] | |
| parent | 1d01f3d2958cfc85abbeb5e835fcabb40125b461 [diff] |
am 1d01f3d2: am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" * commit '1d01f3d2958cfc85abbeb5e835fcabb40125b461': opengles emulator: support NULL as parameter to glTexImage2D (gles1)