tree 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5
parent 157a9484fa49963b2210de50930c51fa69e7d397
parent 0aa4815a286596c04ef30c7979cec24923d93763
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609725110 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609725110 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6bcc71b136 -s ours" into rvc-qpr-dev-plus-aosp am: 0aa4815a28 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9f1b3a97d059579558ac1f4ed0c29821b20e0d0