tree df3e2531dbc2062eab1729f982bdb9036443d365
parent b69b2d19fe0a7f27394c344ff09be7afa92a2e68
parent 846828162d50b1a706d39c8cf0fa893784092e9d
author TreeHugger Robot <treehugger-gerrit@google.com> 1625374679 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625374679 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ee040c5ff6 -s ours am: 846828162d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3b6d74fcbad8f7cbdd02e720638b9efefc8e6721