tree 597c8cdf8bd515e7afa4ef5e66cde6e1f5ccf77d
parent d1d589b94db909d2f40977a0ae5cfbf6a18b6c9f
parent fdcc3961f0b3ff338b3a279cfa18120edc57d0fd
author TreeHugger Robot <treehugger-gerrit@google.com> 1619500239 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619500239 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Id70c32ccc5923034665bb7464738b4a4366a93d9