tree 69b807315959dadcc4706e84b94518527afb277e
parent 12d8c1b40fe130d13eb1c4367559d1fe0c1ca36d
parent 7dd228c650277dfcb701e5cd1ce535beb2f41242
author TreeHugger Robot <treehugger-gerrit@google.com> 1631435392 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631435392 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I16fee430ddadc472a36fd8cf019f9c99b76b97de