diff options
author | Tsu Chiang Chuang <tsu@google.com> | 2012-02-19 07:46:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-19 07:46:04 -0800 |
commit | 0d910413a1c9706e52ce81d9ccac475ed0f47130 (patch) | |
tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 46498e9f21507163f073196bc2d13e22d617eb65 (diff) | |
parent | f7285d1418f0c8ca2a1ca176599ed1d5c7089326 (diff) |
am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '90cfe0f2f1e0e54c876157862abc0a588ef84b93':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions