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