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