tree 3d32c0aca4119a3e2f53495d93af28de453ed26e
parent 0aa4815a286596c04ef30c7979cec24923d93763
parent 6d64f4aee5efd4a22746dd66275befd1bcc41845
author TreeHugger Robot <treehugger-gerrit@google.com> 1609724211 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609724211 +0000

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b9b7199fc470494b735d79f203ca7bb76a0a080