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