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