tree 9c3c60ef980072056e73a3d5283af90e4bc8ca8e
parent 49979ba990136f9053c789116f09bbb36224fe37
parent 9392aee9d39e8c56f4eab61bb1c19041ae390798
author Bill Yi <byi@google.com> 1696307856 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696307856 +0000

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

am skip reason: subject contains skip directive

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

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