tree 9a8f86c28119aa209a17978d794f5f0d8988c822
parent 4767edcc1920266c00c42fac58f4bec1e28d3757
parent 333568d69071beb6dfc4c7593c024e30c64afa81
author TreeHugger Robot <treehugger-gerrit@google.com> 1620406038 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620406038 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 333568d690 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I96b3ba6f47e8c09f0aa53e79dcec522a65293f47