commit | 832020406793f8dfa8a93cff9e37d73966cefbe9 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Tue Aug 09 10:07:00 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 09 10:07:00 2011 -0700 |
tree | 4b6ac44fae2cdb41c0bcf3d62a6734175fe77d5c | |
parent | b5e8d4c52061ce3ff4153741f37017f299759352 [diff] | |
parent | 89c5482b0f673d40778ba9a4f424135255d243f7 [diff] |
am 89c5482b: am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120." * commit '89c5482b0f673d40778ba9a4f424135255d243f7': opengles emulator: forced GLSL version to be 120.