summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2011-11-17 13:12:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 13:12:39 -0800
commitf20c35932793ff93cddfb45a4220a966ac5cbf76 (patch)
tree6612a4783a0af5dacf89a520c8ea80420dc0103b /opengl/tests/gl_basic/gl_basic.cpp
parent637742c34e9db537260bfbd02b461218d2a8f214 (diff)
parenta26d0e3ad21f03ad71b1e0568c1a328812830693 (diff)
am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '2b9af44e401d884469869a4ac0933bfa727d3135': Check the bluetooth state for getUuid call
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions