diff options
| author | James Dong <jdong@google.com> | 2010-08-04 11:12:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 11:12:40 -0700 |
| commit | 703f6aef51ab99cf70073ac2fe42a7431b2333b8 (patch) | |
| tree | 30fbfeb62560c8503a6f8e32e9624c129f98c194 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5e9ccb8f3bb9dbf2b9f48ff10f22c2bd9a57d8d4 (diff) | |
| parent | b9ad669761e33f2f9447172d5d438d9febf1cc58 (diff) | |
am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'
* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
Replace CHECK with a failure return value when mCamera->setParameters() fails
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions