[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2
-s ours am: 62880febef
-s ours am: 101d12062e
-s ours
am: ccf58a9aaf
-s ours
am skip reason: subject contains skip directive
Change-Id: I0a25dedd8476d0ce436c4d8cb7fa28986310fbb1
This commit is contained in:
commit
1031bd58fa