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