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

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