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

Merge commit '6d3bbd753e63d36f7efab3d6dd0984086fff0702'

* commit '6d3bbd753e63d36f7efab3d6dd0984086fff0702':
  One camera is probably sufficient
tree: e0c1facaead24dff695a118d8eef4fbf8dc6ad60
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE