tree 20b5ab370d15e79f25700a590d21266ee60e230f
parent deb7457f43b58ddcb6fbc425321989236cd42f5a
parent d24afc43d340c4753f09631ad20c525cee943d3e
author Wu-cheng Li <wuchengli@google.com> 1282590141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282590141 -0700

am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread

Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c'

* commit 'caaf7fe3a407c764f643585d050c16f5fb56503c':
  Handle the camera open failure better.