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