tree 172a30620a3918337e0c442cece5fcff5fe3348d
parent 6d40714edc7bdb1283ed2ef00b5528a46b1e904c
parent a990a5c3dde31e9c7bc9c772347c32de9da6e549
author Bill Yi <byi@google.com> 1696551279 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696551279 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 812e92733c -s ours am: a990a5c3dd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id28fa346d7d0867f16631c620577725b5f15d18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>