am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE

* commit '2a01fc22d40d00192dd53dd6413ab9cce56d778b':
tree: 2279474a098b70b2ac1f20ad5d305d7132926cfa
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk