Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c5ac30c03 -s ours am: ee19066e5c -s ours am: 143a038c91 -s ours" into sc-v2-dev-plus-aosp am: 869cbe8f5b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325201 Change-Id: Ica33d98d6de3e75ae6e9b4502eada8931cc68379
This commit is contained in: