[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 2d86f24cb0  -s ours
am: 387a6d20f8  -s ours

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