tree b504aa0ba02ef80fd83ba7dba5e27eea72a10aeb
parent b7a661266b69bec40ec116d6890c6559b01eae42
parent 48f6ce0e17297c575dcbb25671a7bee80ba13061
author James Dong <jdong@google.com> 1280876246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280876246 -0700

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