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