Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 9786c1215e -s ours am: a1a28fd5e9 -s ours" into sc-v2-dev-plus-aosp am: 03250ecfc3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590966 Change-Id: Ide4d1cbd9435436d0e6b6a8020ccd6d60a64c640
This commit is contained in: