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