tree 9ea07b9e1e724b8fa0ea0d47a934f39d126384d8
parent 76ab3c2fefa985aad4a673f7dc031d36a66447a0
parent 9fcf4cfcfa659252a73db2f10945b4a02063eb3f
author Bill Yi <byi@google.com> 1695679352 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695679352 +0000

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

am skip reason: subject contains skip directive

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

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