Merge branch 'cupcake'
tree: c3fe0ad67b84753dd4e18736dbda62af74c97f53
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2