summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-07-28 04:18:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-28 04:18:10 -0700
commit22e8963e0d4ceafb9453fc7baa8405d68a302f40 (patch)
tree7b84d84a9d2b56a07f17e822fd4f78faeebd839a /opengl/tests/gl_basic/gl_basic.cpp
parent622b85f76978fccd30175b1ee07f7c100135885b (diff)
parentc1bab16956d31b6b6ab9e085a852e40b6dfa3a35 (diff)
am d5786b98: am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b' * commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b': Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions