summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorTsu Chiang Chuang <tsu@google.com>2012-02-17 15:55:56 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-17 15:55:56 -0800
commit2c283a41cbdbeaa9663c9316c3ed16d14aa094cd (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp
parent589760ba2c5439422ece4f8fccf32701bab75ad5 (diff)
parentaf139111ad8af93ea5b4a5adefa97f98f96dd086 (diff)
am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '2d559b5311be1cd909e5a445afe75a840688b822': fix NPE in race condition.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions