summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-01-12 09:00:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-12 09:00:21 -0800
commit84b066fddbba11338cd11b9b19c796c06d6aeea7 (patch)
tree12823493d1b9718500ad69feb1d6670900863b88 /opengl/tests/gl_basic/gl_basic.cpp
parent98db1598b98272ac9138cfd8cdd1b5f1fcd9ff7c (diff)
parentc6c8d06ea8f4753c68f22e03190420dc25f302ec (diff)
am ce77af47: Reconcile with ics-mr1-release
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions