[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5d3e7daa9e  -s ours
am: 54a9fa03f8  -s ours

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