diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-02-23 08:34:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 08:34:44 -0800 |
| commit | 7751c440cad1270f3539c0c0b656431019e3394d (patch) | |
| tree | 0efe8e381ec1cb061ac1656849435dbc73862c6a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 48bcb4be7b7045c3b421ca01e11d97dd3a8067c7 (diff) | |
| parent | 46498e9f21507163f073196bc2d13e22d617eb65 (diff) | |
am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit 'c16d9de72996950ec7f55af80d2864cd2abad1c2':
fix NPE in race condition.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions