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