tree f06baf1b78cc9e4bf896c8a479f7c15d15de006d
parent b701023fc0d3540df83048e7e5e17937616f978c
parent da46d42b8721ed2d2c7d0556dcd689c99ec80955
author Bill Yi <byi@google.com> 1628895955 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628895955 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544444

Change-Id: Idf328fc9fd8e99f9e6e5ea77c6d5b5faa90e89cf