tree 1b6db7bea9625a8cf9a92ad82e8747786c69ffbd
parent 70015859596581d20022c1f7d075ac41e5a596e2
parent 5dcde92769e02729b35751eedfc6851499fcd2a7
author Bill Yi <byi@google.com> 1696901287 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696901287 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d1a8b7d0d -s ours am: 5dcde92769 -s ours

am skip reason: subject contains skip directive

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

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