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