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