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