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