am d194f3d6: Merge "Replace CHECK with a failure return value when...

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