tree a09a759a940916b975c4ab0ad220627db5b0a444
parent b524d9932f5e3573d141ae0d3bea11ba22026a93
parent b8151fc862bea8388293d6f6ee1b1d1f8f2e70fe
author TreeHugger Robot <treehugger-gerrit@google.com> 1626112669 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626112669 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I494943d7e9f6f0e801b302eaf85f8bc374f9eaf8