| commit | 5dd949d29c14eb74870c9ce5fa7af21b629d8ece | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Tue Aug 09 10:06:32 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 09 10:06:32 2011 -0700 |
| tree | 680a92309512dc1cdfa926f0bf9692619c7533d7 | |
| parent | 6b445a641c38d4e68322d8270f761157ada9ebf9 [diff] | |
| parent | 42d5bd124b94dbcc684c8c3840891bbb54278071 [diff] |
am 42d5bd12: am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS" * commit '42d5bd124b94dbcc684c8c3840891bbb54278071': opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS