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