Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 03dea08a2b -s ours am: d24d4a24d7 -s ours" into rvc-qpr-dev-plus-aosp am: a44b12e7c4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086502 Change-Id: I9d3970fb9031738e44efe2b8260fe2e833b5d565
This commit is contained in: