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