merge in master-release history after reset to 17f326b7458c2bde2569e283a96e703755485328
tree: 7c6a20591d4e5bb84e708d89aa75a9f8c7c22e33
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk