[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 skip reason: subject contains skip directive Change-Id: I5db4fafec9e8f1745b3c0b842442593888135e16
This commit is contained in: