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