commit | 5892c4678b3e66b1e1f8f3c93214274842c72bd8 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Wed Aug 10 12:24:51 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 10 12:24:51 2011 -0700 |
tree | 915062c76aff31268aee6ae5679bcdb9af68a05e | |
parent | 90e65d4aa425a4d416712c7b784aa7fd10fed39f [diff] | |
parent | 832020406793f8dfa8a93cff9e37d73966cefbe9 [diff] |
am 83202040: am 89c5482b: am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120." * commit '832020406793f8dfa8a93cff9e37d73966cefbe9': opengles emulator: forced GLSL version to be 120.