[automerger skipped] Import translations. DO NOT MERGE am: 6f52cfc821  -s ours
am: d6cc05be1d  -s ours

Change-Id: Ia7eb3eafb6844300693c864ddad35cbb5a7de9f9
tree: bf3e9891a01142c2344300e2e7bb532d98a2db7e
  1. common/
  2. dictionaries/
  3. java/
  4. native/
  5. tests/
  6. tools/
  7. Android.mk
  8. CleanSpec.mk