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