Commit 37a4aeaa authored Sep 04, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 04, 2020

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b983b9df -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0fa6a0f3ee6a2a623a229eef1c03273d7052889e

There are no changes