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

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