am 386d8871: Merge change I0bda9c39 into eclair

Merge commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a' into eclair-mr2

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