summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-20 17:40:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-20 17:40:07 -0700
commit9de4c5825eb49e0df240967628432bf9af944de9 (patch)
treee5b894e47bdae3c99ce121f79bdc5c9f0c3c6b0d /opengl/tests/gl_basic/gl_basic.cpp
parentf3d6ab2ce7f87d46c6196ac964ee6f53927e21b8 (diff)
parent764bc9df66b430a4a011fbedb17c66ee3d3336a6 (diff)
am 433567b5: am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
* commit '433567b57c96525fb6c1c39e8ccb9780548441ba': UsbService: Handle the case where a USB accessory connects as the device is booting
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions