[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f4ed8f123
-s ours am: d731040faa
-s ours
am: 4289710264
-s ours
am skip reason: subject contains skip directive
Change-Id: I54ae1a6b577b9e1c7b87045cc1382cfa48320fcf
This commit is contained in:
commit
d7cc49af16