diff options
| author | Jesse Hall <jessehall@google.com> | 2011-12-02 12:35:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 12:35:22 -0800 |
| commit | 75a3e54e661133cca373cad7a6fe398e17440aa5 (patch) | |
| tree | 48623910fe75822605f4a4c5884e8b8bcd745d86 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ae065e1c2fa60865cbcd9e3d6ad05ebf746358bb (diff) | |
| parent | 00dbb097dca9b29dc35cb52f11329c86c26fefb5 (diff) | |
am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
Disable GLES20Canvas on emu w/o native GL
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions