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 | e41f9ba4869a96f004c731d8d17939ae607143b9 (patch) | |
| tree | 014a73260d60c41d6a07e3128663d95fda5435af /camera | |
| parent | 216e5df78e958a3349ba4785fb79c688e1ad39a5 (diff) | |
| parent | c0330ab7213be992099c83aa27c603707363a58d (diff) | |
| download | frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.zip frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.tar.gz frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.tar.bz2 | |
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 'camera')
0 files changed, 0 insertions, 0 deletions