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