[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: 2bc446c98b -s ours am: d53c21e60e -s ours
am skip reason: subject contains skip directive Change-Id: I83790cb194d4d50f2a810404adb8913e166e1e43
This commit is contained in: