Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours am: 545560b547
-s ours am: bea0b23926
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
This commit is contained in:
commit
9a4bc0c15f