summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-10-21 10:56:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 10:56:19 -0700
commit9fac14b94eea683574c180797d612d9f2df25e2e (patch)
tree098417931546946efcd3ae0cd964b2d743dc5d89 /opengl/tests/gl_basic/gl_basic.cpp
parent449d9e2979372163efd60a574a175b9992b677a2 (diff)
parent97d3435086c9f4cebc0205eca0fa6ec61dfc5b93 (diff)
am e55806a5: am 23392a84: Fix the build.
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d' * commit 'e55806a55561c992086ddff717aca27206fa0c5d': Fix the build.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions