tree b545e695bbb637ea508cff672fee0925717fb9b8
parent 718e21c3f1d380c972e58b4cea5ccbdb57656c5f
parent d5bc7bec2afb65998ee88c47c64d00ffd42c0724
author TreeHugger Robot <treehugger-gerrit@google.com> 1673984859 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673984859 +0000

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

am skip reason: subject contains skip directive

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

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