merge cupcake into donut
tree: 8ff6ec4686ae12080d17305bccdf566ead3eb6a8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE