[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 60dc13442b
-s ours
am: 00a939c043
-s ours
am skip reason: subject contains skip directive
Change-Id: I10a8e802ac611b4610bcc42f3a25581b80c8694d
This commit is contained in:
commit
f3fa8789aa