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