[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: bf7796baec
-s ours
am skip reason: subject contains skip directive Change-Id: I2ef189f15acb569f9c5aa573ee1ff58cdff29618
This commit is contained in: