tree e92493f9267fd38bc78910009a0df1732aa5a71c
parent 8dcf2714ba914c656ac6e40eb6863aaa7730d2cc
parent af509a83f7fd37eabaa43668e6c297558a357088
author Bill Yi <byi@google.com> 1695873807 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695873807 +0000

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

am skip reason: subject contains skip directive

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

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