tree 65fb43df459f18984138b9e99d3941f6297c02a9
parent b1265ab0fedb5cdd287f5aa91fe3fde1afd9e374
parent 577a8316c44a733054c1ff228a82eef88365c028
author TreeHugger Robot <treehugger-gerrit@google.com> 1595688813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595688813 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I9578cf972a0ca8f8e6f51589d6d9dfecf3f1ec3b