| commit | 93d3e26aea66a0baaa61c7efdf780a8fe8723ada | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Wed Aug 10 12:23:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 10 12:23:26 2011 -0700 |
| tree | 167cca806503f5fd83e60bc5b4c9e559327f5dd9 | |
| parent | 2bcde19db4191aba378a94c886df1f18a140c713 [diff] | |
| parent | 5dd949d29c14eb74870c9ce5fa7af21b629d8ece [diff] |
am 5dd949d2: am 42d5bd12: am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS" * commit '5dd949d29c14eb74870c9ce5fa7af21b629d8ece': opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS