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