diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-18 02:37:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 02:37:22 -0800 |
| commit | fa1a6eb584dde49d424fa53a995a6d0dbd45155c (patch) | |
| tree | dd338b7c9df14f53b01e8d58209c1366eda3ceb3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e761f1e58f3946b01f9715e145b402db16f81367 (diff) | |
| parent | 0272e60060162d2c32aec02d9cd1414dbbe14782 (diff) | |
am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
GLES: add image external enums
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions