tree d2bab3d3809f637b827bcefe5b02b89869553560
parent 43575e12c391d5e116415350adb8d30cdf9c894d
parent c55b27b0797d096d80f53db39af1808445afb7c0
author Bill Yi <byi@google.com> 1704331790 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1704331790 +0000

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

am skip reason: subject contains skip directive

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

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