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

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