diff options
| author | James Dong <jdong@google.com> | 2010-06-11 14:34:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 14:34:09 -0700 |
| commit | 6dd4cd53c147b3d0468e497763a8f52b67fd8335 (patch) | |
| tree | 148065c8ad7acd5ff445c1e7af5f5188f8c06a33 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 22b81d7c693031c20e906f82fd096aecea5607b0 (diff) | |
| parent | 9090e5fd608a06a2f086d7618cc18bc2b90d0ad7 (diff) | |
am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'
* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
Initial checkin for pause and resume control
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions