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