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