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