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