[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 028cdfdd05
-s ours
am: 65c62dc5e9
-s ours
am skip reason: subject contains skip directive
Change-Id: I1a265d2693914222df1a85cb0bde128efc5099e3
main
commit
5de641c461