summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-09-19 11:10:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-19 11:10:57 -0700
commit376cdd6d595d9db4276366fcf623787c1060670d (patch)
tree7ca7e20fe87fa8cfc030f8bba6aef1f3d7a12e93 /opengl/tests/gl_basic/gl_basic.cpp
parentcc89e1208fe843d21215de55de737667e410ce2f (diff)
parent1f6bf40676a182ca67d5479f055decea5522bde9 (diff)
am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp * commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b': DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions