summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-03-15 23:47:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 23:47:20 -0700
commite8d4ba83cf2e4f54b6f0377200d74ec29c8ea19a (patch)
tree0768d0e9d2ad8983469a9759df7ca3890ff09cdc /opengl/tests/gl_basic/gl_basic.cpp
parent2e2a68770e3a6ec7f775baab5e5194e36b78c0f2 (diff)
parentc83eb9fcaa10d8ffd146f0381d5092f5ab2c4fa8 (diff)
am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
* commit '6ad9cc9afd1229db0ee68a889979feffbbcba557': 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