[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours am: 306d47bca5 -s ours am: ed8a3467a3 -s ours am: 55b0571d37 -s ours
am skip reason: subject contains skip directive Change-Id: I199bd28205eb9d2ee4fb0f71671c4160d4d1630d
This commit is contained in: