summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2011-02-07 08:02:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 08:02:00 -0800
commit6ebbed970632168d12a5eb2e0334e7e9050b5513 (patch)
treeea8394774dd2af9d10699c0198d5639d47f212a6 /opengl/tests/gl_basic/gl_basic.cpp
parent9459a83815875771f7c69ec5ca6d4d977acc33ed (diff)
parentb68bef3b70a70704dad524f994104d254f3c0d1f (diff)
am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
* commit '6b497a0446ebad24305d5e29d5fd5e65014b9778': Fixing possible race condition.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions