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