Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13f5b25c authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

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 'd152c1c7'

* commit 'd152c1c7':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
parents 5bac1cc0 d152c1c7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment