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

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