tree 5340b2fe9f5e8327613be831097219b9c4b570bb
parent 4c215007cf538d5e295aff6d3cbf5a9b7105e2d0
parent d3552ecc9cf019b60b2c1db8bf7dcc9c8a1da73d
author TreeHugger Robot <treehugger-gerrit@google.com> 1627697071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627697071 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ib15582507e35ecfc1d55a7c4ed56b888eed8aeda