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