tree 14ca34daef1bc05d25480439a85f0f3d571a4411
parent 18b36f0dbaaf7164a9a77dc5a5431d324e36c879
parent e85c56e507fdac9989381d02cb0cbc446b264c96
author Mike Cleron <mcleron@google.com> 1257812489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812489 -0800

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

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

* commit 'e85c56e507fdac9989381d02cb0cbc446b264c96':
  One camera is probably sufficient