Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours am: a0315ad1a5 -s ours" into rvc-qpr-dev-plus-aosp am: 1c285d0e36 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942 Change-Id: I463888a5edbfdd243e9f78f5a4732f031c87fb76
This commit is contained in: