[automerger skipped] Import translations. DO NOT MERGE
am: 3aa88b0aa6 -s ours
am skip reason: subject contains skip directive

Change-Id: I53bb68c2cedba0af69a841b62abecdb687e3276a
tree: ccf3b830b2c87eac67406621f1ba877a741bd2f1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg