summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-03-15 23:50:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 23:50:40 -0700
commit6509fac8d733dc78fbe4cba423c8f07caf8fdab3 (patch)
tree52040131225c4a878ce94d5618802611a1331422 /opengl/tests/gl_basic/gl_basic.cpp
parent463b75693ef221cd587422196182409bbf62b7c9 (diff)
parente8d4ba83cf2e4f54b6f0377200d74ec29c8ea19a (diff)
am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
* commit '30d7eb02b5e9533efc41e1fc98eac5c5a6891903': Integrating new ADB USB debugging asset Bug: #6699FF
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions