[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 79f352382f -s ours am: 3fc58ee5d5 -s ours
am skip reason: subject contains skip directive Change-Id: I2d9c2893b63289a6877e46d4379d3d1e5fa22196
This commit is contained in: