[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours am: 793e99ff96 -s ours
am: 60b0ca2c2a -s ours
am skip reason: subject contains skip directive
Change-Id: Ifec076bb6244e538a71d0f1d145ca08685be5bd3
This commit is contained in: