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