[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e801eb78f0
-s ours
am skip reason: subject contains skip directive
Change-Id: Iec5326a7073be2ccb79d79ab53f5dfd89ffbfdb8
This commit is contained in:
commit
e92a1a9c2a