summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-03-15 11:41:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 11:41:10 -0700
commit56b53603d996385d5952c67fbf27a87e5201de69 (patch)
tree3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp
parent08e024a356281addb0d92e283bd8c36324f68791 (diff)
parent124eb84c5ef018482538fac2912a0fdf29b14567 (diff)
am b243aabd: Merge adaa12cd from honeycomb. do not merge.
* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed': Merge adaa12cd from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions