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