tree 9f9bb432554ad8ad1a3cae89f1ae40034e66fa3f
parent 4314ab389b25a6f51fa8b1a71a3be6ac297f7ec5
parent 3a075deeaa750a041115cff50c85d421dad47eda
author Bill Yi <byi@google.com> 1687455025 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1687455025 +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: I9c501c673e84ad75688b21ce070a4be50fb72f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>