[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 900a59f177  -s ours
am: da96495c86  -s ours

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