tree b818e98e89f20fe2d1a250445b7f12807f9a095a
parent 3256d2cc209663929878435f08d1bd346ff04098
parent d05811902424e8c0643ac415804b799b19f1b7fd
author TreeHugger Robot <treehugger-gerrit@google.com> 1664703270 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664703270 +0000

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

am skip reason: subject contains skip directive

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

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