[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 992d47a237  -s ours
am: 601a2d4470  -s ours

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