| commit | d152c1c7534a80b84f6b389efa8a410ea359b3eb | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Tue Aug 03 15:57:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 03 15:57:26 2010 -0700 |
| tree | 4ca41aea357563f868b904d91cc7034cc60489fa | |
| parent | 9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4 [diff] | |
| parent | d194f3d68188a0993617ba8cc29d8abd381b6069 [diff] |
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 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp * commit 'd194f3d68188a0993617ba8cc29d8abd381b6069': Replace CHECK with a failure return value when mCamera->setParameters() fails