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