[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: 2d8b962698 -s ours am: 58c18b6fd6 -s ours am: 1187edbbf9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566 Change-Id: Ic29f188b9669ef4ce8e47fd00f1bb9c3fb04a0e2
This commit is contained in: