tree 06c0db80791c9d5a37d7485f3126909c07a5fdd2
parent a71fe535c853730828d03148be4dbe76baa79eb9
parent d6540af794be5bc14da45e9b29bfae05d8e6dedc
author TreeHugger Robot <treehugger-gerrit@google.com> 1625539046 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625539046 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iba43ae2b52510282ab1ecea4ac748a3ef596ccbb