tree 2cfcc7682e8ead397f2668c47cf27bcb081bebf0
parent b58fe43ff9717a70870542627ff3008326af945a
parent 4e48066e7155911b65b6e44ffade7f7c9dae2b8a
author Bill Yi <byi@google.com> 1630269591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269591 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I04d2ca21a73c0f74ebc0a06e2c924a6ca19e0b59