tree 55832f100f9befaf3d9dcb37d86379ffc488a418
parent d86a4b4e11b07bab91ba6fe2f2e6dc7215dc15d9
parent acc1841afca3f31eb9990012ed5ff2f9a8ba3711
author TreeHugger Robot <treehugger-gerrit@google.com> 1641708529 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641708529 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 977e1ea587 -s ours am: acc1841afc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4868ece0d866e71e4e1006b418c24183a25dc892