[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e
-s ours am: c70c3a3236
-s ours
am: 8095dc0335
-s ours
am skip reason: subject contains skip directive
Change-Id: I434fbb316d2a10f3b68045de8500fed5625b53db
This commit is contained in:
commit
f5eab04303