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