tree 03fe14623647b95011abd20442d57004c03afc0d
parent 8d6fd88357dff584cd4c7c943d0f4b4a2ebb5d08
parent bde2b96434b618c9a662fecadb85b2304ce53971
author Bill Yi <byi@google.com> 1696305131 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696305131 +0000

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

am skip reason: subject contains skip directive

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

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