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