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