summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-11 11:37:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-11 11:37:14 -0800
commitbac02fd025e9ff2205eed1d4862173e45da1cb96 (patch)
treeaab456746a87080f3777cd2506e94fae18f43931 /opengl/tests/gl_basic/gl_basic.cpp
parentd3e53c188459aecec5377ed03b92bedfe72703b9 (diff)
parente195b4bc54d486da39328d9e1ad06a43bf9056fe (diff)
am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb': UsbManager: Hide APIs not needed for USB host or accessory support. Remove MtpClient class from framework and public API UsbDevice: Move IO related methods to new UsbDeviceConnection class
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions