merge cupcake into donut
tree: 029ca9a98ae916900e2dca6ff51445794bac4007
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml