Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187
-s ours am: 3e5c5b08bb
-s ours
am: 675bf55475
-s ours
am skip reason: subject contains skip directive
Change-Id: I1f0b0d97f928be7f2057a6af2f3595ab18050938
main
commit
adb2f0ecee