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