am 71d40934: Merge "Fix camera app crash when failed open the camera." into ics-mr0

* commit '71d40934176ee23be9a91ca0aa33656e1cce8ce6':
  Fix camera app crash when failed open the camera.