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