tree 7850939a3d0ad0305ab0f1c56a0ca407c4a4908d
parent 57914ab3ffd8638008d5778f7abf5c746a6b82f4
parent d33dff6c9b47d5ff85b8607d4673c720791d7d09
author Bill Yi <byi@google.com> 1694831223 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694831223 +0000

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

am skip reason: subject contains skip directive

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

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