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