tree 6ac71426ed2817b165b3bdc955a26e2c9db6a068
parent 95d2d066d6735a9603de80429baf030c5c7c38ce
parent a6e504c8d21efbb1d5e1f0765607da2bb8a14fc0
author TreeHugger Robot <treehugger-gerrit@google.com> 1674588943 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674588943 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a6e504c8d2 -s ours

am skip reason: subject contains skip directive

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

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