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