diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-12-12 16:10:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 16:10:28 -0800 |
| commit | ace62f2b79792222f964e2465821539da2813c06 (patch) | |
| tree | 76a85ebc08e2538fb6a27cea972455efcc38a856 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 57f827dd76d70d5d33790eea784465717cd3a258 (diff) | |
| parent | 51ce74df347eeebfb83441137ac85717791926c0 (diff) | |
am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
SurfaceTexture: fix a verbose-log compile error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions