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