summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-04-04 17:44:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-04 17:44:46 -0700
commite26dbc56ce31cef49f522c6743577caba715e527 (patch)
tree2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp
parentb5ab4f3aa89659393b131bcdbd76b304a9c81114 (diff)
parent32b372393d71897ea9ce5fd5f2ab99d35f9992dd (diff)
am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9': 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