commit | 89c5482b0f673d40778ba9a4f424135255d243f7 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Tue Aug 09 08:56:27 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 09 08:56:27 2011 -0700 |
tree | f80938b03d31a70b34c57e06aea45198690aed5c | |
parent | 81973086cf93e84fdbac204a4d9dd06cbe72798c [diff] | |
parent | 283df9c42cebba5e2c252faf39754384ab0974a6 [diff] |
am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120." * commit '283df9c42cebba5e2c252faf39754384ab0974a6': opengles emulator: forced GLSL version to be 120.