am e85c56e5: am 386d8871: Merge change I0bda9c39 into eclair

Merge commit 'e85c56e507fdac9989381d02cb0cbc446b264c96' into eclair-mr2-plus-aosp

* commit 'e85c56e507fdac9989381d02cb0cbc446b264c96':
  One camera is probably sufficient