Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda
-s ours am: 839ace7e62
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
This commit is contained in:
commit
8f10cad3bb