[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a
-s ours am: e002abfb6c
-s ours am: 489b78cae9
-s ours
am skip reason: subject contains skip directive Change-Id: I6e9617143d7d85efdd78eba3d3f34e00e1684c06
This commit is contained in: