[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 3c1ce4f32d -s ours
am: 8ca592e6cc -s ours
am skip reason: subject contains skip directive
Change-Id: Id8a51338ea18c04046435cc6a6c1972fd4bb6c1e
This commit is contained in: