[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b539282c2 -s ours
am: f32bcf72b6 -s ours
am skip reason: subject contains skip directive
Change-Id: I1874b6ccb4ce4957e55573e3aca9bc65dd904c19
This commit is contained in: