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