tree 533082182d40278ced4dc6da5fd1d4916af1aef9
parent 550826a3b909e130802162685484f32ef7b777de
parent 2cc02db1cd264e9298d7c18897335b835320b102
author Bill Yi <byi@google.com> 1694195165 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694195165 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c6d8c6397 -s ours am: 2cc02db1cd -s ours

am skip reason: subject contains skip directive

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

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