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