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