Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8e36e46a45 -s ours am: 8c21e4804f -s ours am: 8fea045c00 -s ours am: 10670904b6 -s ours" into sc-v2-dev-plus-aosp am: d675e52a4c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15695548 Change-Id: Id13dd30dab6b80e2c87e708b79be1d2e538b941e
This commit is contained in: