Merge "Follow up to I21b54b35"
tree: 5737acf5fba75f3c4957ce71573e44354fb98144
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk