[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: c51e9b5864 -s ours am: 95d020b526 -s ours am: 433fcc134e -s ours
am skip reason: subject contains skip directive Change-Id: I198f89c938109b2bdd1809838d17f71b8c1955b1
This commit is contained in: