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