tree 90d8061def99099e464e6d125efd08f3bc13f246
parent 1e40a5d256f3aa9ba367373921bfe22552680c22
parent e89550222387ce083863b89886bc43af2da61fbc
author TreeHugger Robot <treehugger-gerrit@google.com> 1599147701 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599147701 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I572304d0a513ab314282b54f282c359ddbf5beb9