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