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