[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e7f3897b6a -s ours am: effc2bdd8c -s ours am: f241a62445 -s ours am: 43f95a77d9 -s ours
am skip reason: subject contains skip directive Change-Id: Ia690559dde73bca3a43ed542396a725a2356c3b3
This commit is contained in: