Merge donut into master
tree: 033d1e52ed2a2c57fb2af4786ce5f1b4d7ecf635
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE