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