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 | 13f5b25c627b63f24f50efab39b82b8d8610ccd7 (patch) | |
| tree | bb98ad676d753c40b3921fc27a8f2e8f273cf186 /docs/html/sdk/api_diff/4 | |
| parent | 5bac1cc0b8ddfeb1290d8324beaadd1e48f3fd14 (diff) | |
| parent | d152c1c7534a80b84f6b389efa8a410ea359b3eb (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 'docs/html/sdk/api_diff/4')
0 files changed, 0 insertions, 0 deletions