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