[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f9d3758a02 -s ours am: 9280c124ed -s ours am: e5c429a965 -s ours
am skip reason: subject contains skip directive Change-Id: I7d7e980a25151b78081316a0131047375665250d
This commit is contained in: