[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a -s ours am: f97c675cde -s ours am: 0da8214ae4 -s ours am: 625cd52625 -s ours am: f790e1a0eb -s ours am: 1d16220f45 -s ours
am skip reason: subject contains skip directive Change-Id: Id65a5e1eb2ef7391a4a2da24c7d9ed79e302e4aa
This commit is contained in: