| commit | 42d5bd124b94dbcc684c8c3840891bbb54278071 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Tue Aug 09 08:44:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 09 08:44:21 2011 -0700 |
| tree | 65f42c2065f6d559b17428ba236ad98d387b6f1c | |
| parent | 9e0dba41bfa5f2029618958a7c2fcfa12e1723ad [diff] | |
| parent | ad3f4df38857f2c0a456d10bc6644f717693cfb2 [diff] |
am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS" * commit 'ad3f4df38857f2c0a456d10bc6644f717693cfb2': opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS