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

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