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