summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-15 13:49:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 13:49:14 -0700
commitb28384544b9994596e06259ec9783b0da34d084c (patch)
treef90cb040b4de49ec2140b63384bed25656088940 /opengl/tests/gl_basic/gl_basic.cpp
parent05fd0ed107aba2c80ed68671b3503d9a68ee778a (diff)
parent5938ddb5946fb474e035cc6dfb3be1cf4efb305d (diff)
am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5': USB Manager string clean up:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions