[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65e9e82b3e -s ours am: 784cb61c9b -s ours am: f446c04ffd -s ours am: c6715e9313 -s ours
am skip reason: subject contains skip directive Change-Id: I41d8713b564be9dccbf1134ab48b59abbacdb058
This commit is contained in: