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