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:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-17 15:55:44 -0800
commitf7285d1418f0c8ca2a1ca176599ed1d5c7089326 (patch)
tree485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp
parent1ae4c49c327aa33ae3cba7042ffef584a3edd198 (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