tree 91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5
parent 317f5a9810f5d35071cc3c420a366d431d837dac
parent 31f05766bec2ad60a52450b199b2758c64456b31
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592114456 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592114456 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcec292d51 -s ours am: fb226f5848 -s ours" into rvc-d1-dev-plus-aosp am: 31f05766be -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icbe9aefba33e0550e8c2610385a9ae80e8d50949