merge from eclair
tree: 6157d7071ea801fd2d6d5f3aad8b0590b3c6f5a1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE