[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1999854ad9
-s ours
am: 2735c8e21e
-s ours
am skip reason: subject contains skip directive
Change-Id: Id592db2412136f098a02596c9026a2e153dfb963
main
commit
40d7115747