summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-01 21:49:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 21:49:39 -0700
commitc0242197eab18a837c374b152a7450f26c22f974 (patch)
tree6ddb05e5b31cbe031651a7405e2283a791274009 /opengl/tests/gl_basic/gl_basic.cpp
parent76025e44e45881a089a853dbb08b1f09abb30fb1 (diff)
parente8d5136fec62caeab0dcd583c47099339e58c887 (diff)
am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1' * commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1': Wait for initial device scan to finish before updating config.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions