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