tree e0c1facaead24dff695a118d8eef4fbf8dc6ad60
parent b820019556b2b18f61dbd80b99a247f15b97147d
parent 6d3bbd753e63d36f7efab3d6dd0984086fff0702
author Mike Cleron <mcleron@google.com> 1257812804 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812804 -0800

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

Merge commit '6d3bbd753e63d36f7efab3d6dd0984086fff0702'

* commit '6d3bbd753e63d36f7efab3d6dd0984086fff0702':
  One camera is probably sufficient