[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-car-dev am: 39331c6fb3 -s ours
am skip reason: subject contains skip directive

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