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