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