tree 44ed1919c536c867a14d9a457e6cba31108abb36
parent a40f689212f94ed60d8c1c394b841117d0989157
parent b8432338e69f884922fae386cd666f62f71e07ee
author Bill Yi <byi@google.com> 1693514391 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693514391 +0000

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

am skip reason: subject contains skip directive

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

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