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