merge cupcake into donut
tree: fb2ac65c09f25b378e006c891113a3fefe149142
  1. jni/
  2. lib/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml