diff options
| author | James Dong <jdong@google.com> | 2010-06-11 14:31:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 14:31:49 -0700 |
| commit | 9090e5fd608a06a2f086d7618cc18bc2b90d0ad7 (patch) | |
| tree | ba7baa1cbc2a4ab93b7523a90df9c8b132aab577 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9921af3de8b55322ed81ba74e18b15e1555ec779 (diff) | |
| parent | f7b5648c220e14f3b1b8c055a6feb36ae95896bc (diff) | |
am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp
* commit 'f62c57d684b83df7d2817db976c0afdb500ae92a':
Initial checkin for pause and resume control
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions