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