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