[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f05db89c3 -s ours am: 5b04790e16 -s ours
am skip reason: subject contains skip directive Change-Id: Iaf3b4aa0ec320e577985fad58835e29a9219711b
This commit is contained in: