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