tree fac66d8116eefdf0f77fc23a07cb4a8883718f5f
parent 3e91bbac758401c9fa53f4956ad723601648aa58
parent f7c8be783fcd1da81ff166c6a8af20635c36233e
author TreeHugger Robot <treehugger-gerrit@google.com> 1621536223 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621536223 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I49a955e22f18879fb5c2f26dd0922bd0af5c8a19