tree 03fe14623647b95011abd20442d57004c03afc0d
parent d707da9360b0100f7064dbfc4e869e604ac50015
parent 1fc95fcdb5fd2dd1881010934abc317a9c017e98
author Bill Yi <byi@google.com> 1696305089 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696305089 +0000

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

am skip reason: subject contains skip directive

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

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