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

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