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 | 7bf5a43921217228fc4fb5f614df2aa195be7556 (patch) | |
| tree | 73b3a7aed8aecc66eea4e9e51afa2ebf9e9c591b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2286e13978fc2a61803d4ff23f111e1aa215e7d9 (diff) | |
| parent | f9eed6f949526993aa3bcd5295f6bcb9c5eccb01 (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