[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b5c190fdb1 -s ours am: 89dcbd9a80 -s ours
am: 9387cb1ddd -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbb7a0e510df0f570280ccef9a02b7faac87b902
tree: 6bcd8f5c3deb7f0766a4d5e0f46412a710c10cde
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags