tree 8d0b264064b7c2f17ecdbb54221deb05d51664b9
parent a436b68ca4b4ba9e2befda1fc1ebfa7de99a8893
parent 9ce5a5df73b7550646e61a86ab3ca71f0c34efc7
author Bill Yi <byi@google.com> 1705090513 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1705090513 +0000

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

am skip reason: contains skip directive

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

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