Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours am: 5540373d4f -s ours
am: 8d32123425 -s ours
am skip reason: subject contains skip directive
Change-Id: I86cc2b036103955954182d5d5161494945250602
This commit is contained in: