diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-22 13:56:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 13:56:35 -0700 |
| commit | 632de2d17fd1bd3a221d0be70208261765562072 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 594b57954b0485b790ed66308b9d0985552d7885 (diff) | |
| parent | ae01e99c1a09aaffbd6f19d0d3e926cbc7ad52c3 (diff) | |
am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
fix for pause when loading
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions