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