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