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