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