[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3
-s ours am: 7c609c0cc4
-s ours am: 08d02150b8
-s ours
am: 134778e573
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic03511d581718fb786c55ca4d31affa7392bcc84
This commit is contained in:
commit
5af94ecc9b