tree 725854818d0766f388f79fd58196d5d6db18e146
parent 86f2fcd5ba4c3fcbddfb62e433f10b9f69405f87
parent 6837c133bc204edade03125fb33c04c2463c081c
author TreeHugger Robot <treehugger-gerrit@google.com> 1674588440 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674588440 +0000

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

am skip reason: subject contains skip directive

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

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