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