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