tree 93087071a7c72b35f080f14399ae1416f3cd56d5
parent 8b41ee8d37af25699314b6728c85666c983325fb
parent 7c32b81ee47ab03f742b641e2691c5a8118e87e0
author TreeHugger Robot <treehugger-gerrit@google.com> 1630143430 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630143430 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e034d747f7 -s ours am: 88ab7252aa -s ours am: 55996228d2 -s ours am: 7c32b81ee4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2c2e6544f782731d78a0103d1f268c7ba4d62775