Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours am: 545affd91c -s ours" into rvc-qpr-dev-plus-aosp am: 3f704383a4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501 Change-Id: I5699f8923ac3f3ab3470f5dca67ee81b13374b22
This commit is contained in: