[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c2f7f1a402 -s ours am: e7470afade -s ours am: 7ae55aabfd -s ours
am skip reason: subject contains skip directive Change-Id: I0d664a23d424ea76576108897f9481455c2d54bb
This commit is contained in: