tree 65a85f49de337065cae2b881714479e9af576221
parent c502c8b926eaa8c7efa1eae9fdc4be8f21740d82
parent bb1a6de9acb56c099e5206115606c24ddc796dd5
author TreeHugger Robot <treehugger-gerrit@google.com> 1628364701 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628364701 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ied320534193301b248f9f3a902d67fc22477252d