diff options
| author | James Dong <jdong@google.com> | 2010-06-10 10:18:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-10 10:18:52 -0700 |
| commit | 5c8ec1be4816d5337a853b07c2a44890861f1985 (patch) | |
| tree | c83664aa8f9dbcf25da267601d0d5575ed56123c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a01c56d877908fd28e2d4e1305c4e39c291b94e0 (diff) | |
| parent | 83c15e016aca576aec29fdc2d992aa5512b23683 (diff) | |
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions