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