[automerger skipped] Import translations. DO NOT MERGE am: 3fc7472bcf  -s ours
am: 6e78ee9f84  -s ours

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