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