[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: fb389b2724 -s ours am: 75141af0c2 -s ours am: 915c3e2bd7 -s ours
am skip reason: subject contains skip directive Change-Id: I82f983933aae296c11b31d0f323b5a35adc1b4d9
This commit is contained in: