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