tree 8fa8eb59d800deebb07c9f5d197589696d4a6d86
parent 3b7ce97e5619c744de7033244741974f18239c67
parent bde2b2c03734185ed1abc3dbdcc7bde3cd4bf109
author Bill Yi <byi@google.com> 1694133470 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694133470 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 805b597d1d -s ours am: bde2b2c037 -s ours

am skip reason: subject contains skip directive

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

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