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