Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda
-s ours am: 70755c9a4a
-s ours
am: 524197d83f
-s ours
am skip reason: subject contains skip directive
Change-Id: I6f3dbb2af2b8ab313f7a3365fc7e24461214bde3
This commit is contained in:
commit
cbae281843