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