summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-04-05 10:27:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-05 10:27:03 -0700
commitc30e2fa200a4a9a651b434d8b031d42e21600ff3 (patch)
tree9e6efa730f6809bd12f2bed0f686de6757ba5ffa /opengl/tests/gl_basic/gl_basic.cpp
parent2c8999b4b9b14ad05f67d2750cb85a08d3498e8d (diff)
parente26dbc56ce31cef49f522c6743577caba715e527 (diff)
am 824c6edc: (-s ours) am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '824c6edce8f79aac9c98caabd9b8857d4c580629': DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions