Merge commit 'remotes/korg/cupcake' into merge
tree: 1e11e1499277de5da9a1166fbd826e50d0b6f12f
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE