tree 6dd0224cd84a04da74be02bfe3f839183c4b0f92
parent eaeb35098ee6f8f664528ba0e642fafb6e248a60
parent 5541117c6e14010d2bfb0855c6ce96ff452f9a5e
author James Dong <jdong@google.com> 1280876072 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1280876072 -0700

Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread