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