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