tree 0b84b56572adb72da3412c406b67becdb56f302c
parent bbfea0e27d00c6e2c43fb355829340a0a0d60aa4
parent 3a075deeaa750a041115cff50c85d421dad47eda
author Bill Yi <byi@google.com> 1687454986 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1687454986 +0000

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

am skip reason: subject contains skip directive

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

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