merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 579daf90f697f08e4cd78d57cf2872f61ea5a32b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk