[automerger skipped] Merge "Import translations. DO NOT MERGE" into ub-launcher3-qt-dev
am: 105edb78a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife5ba90bc0ef354745c1b3e1e6b2b3b4a90a23d7
tree: 69ba12cc4169dac114f183aa3a6711c72b203fdc
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml