Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3136ec7b40 -s ours am: 8a48ffefc0 -s ours am: 47b05db1c4 -s ours" into sc-qpr1-dev-plus-aosp am: 93388e5fb1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693271 Change-Id: Ib5d7922f46de80b45705a93798ce8955184fc9cc
This commit is contained in: