Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: b419dee7d6 -s ours am: 95d691316c -s ours" into rvc-qpr-dev-plus-aosp am: 4de8e6c8d1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570 Change-Id: Id08222c05e66990722cd0a51ecdcd7b2027a66e2
This commit is contained in: