tree 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9
parent 8358d1b4f29408eedb53f0fe80bfeaaba9cb6634
parent d289316fbfdffbef4a37365cdadcdf4ff4224a47
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046046 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046046 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 4414d61052 -s ours" into rvc-d1-dev-plus-aosp am: d289316fbf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idbd851b90011477a99660316e2150862cf498b46