am 7b6c26db: am 047b695d: (-s ours) am cf19e604: Merge "Avoid 2 fails if no camera on device" into gingerbread

* commit '7b6c26db58fed76e373a141d2cb34739c0b505e9':
  Avoid 2 fails if no camera on device