summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-12-06 12:46:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-06 12:46:46 -0800
commitfbf277811bfc860b2fbb7ae6d89e441db2ed3ae1 (patch)
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp
parentaa68c197319d6634ec25095b40616cf739a0e8d9 (diff)
parent047dc0fd96d74b961f315e51fb2d4ac4ae198b02 (diff)
am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '05d630691127c022befd071b2bede87c707112a9': DO NOT MERGE: Remove the AVI extractor.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions