diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-02-17 15:58:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-17 15:58:12 -0800 |
| commit | 46498e9f21507163f073196bc2d13e22d617eb65 (patch) | |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2b985f6fcbcbfc3365b9a22e25408b873322e7df (diff) | |
| parent | 2c283a41cbdbeaa9663c9316c3ed16d14aa094cd (diff) | |
am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit 'a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
fix NPE in race condition.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions