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