diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-22 14:00:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 14:00:20 -0700 |
| commit | f48444a5beddf9916b2d9e896159793ba77f2bea (patch) | |
| tree | fdfb1d10aa4dc4465fadb50c378acdc94e91fd0c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f657a3827ff4be1fc826c62bef8b169af79b8c28 (diff) | |
| parent | 5a158def403b46fb4dd426be4fefed90c6cdcbff (diff) | |
am 6e5276cf: am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
* commit '6e5276cf001112f93b3ca811d220331cc74cd8df':
fix for pause when loading
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions