| commit | b9ad669761e33f2f9447172d5d438d9febf1cc58 | [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 | 420413d5210dccca6711259b895d393b733c42e0 | |
| parent | 5e3c016fb9f63020bbc535d5b78db12d75241e1a [diff] | |
| parent | d667ac1d285e59dd1beb4d06ef8ce90265c3e0c1 [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