[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours
am skip reason: subject contains skip directive Change-Id: I60a47c45f4494f7f5e3b396a7176bce00b2f5c31
This commit is contained in: