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