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