merge from open-source master
tree: 5ca6552de080d5a2a992a8e76820b824c760080e
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml