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