Commit 6da5b0de authored Sep 05, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 05, 2020

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

am skip reason: subject contains skip directive

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

Change-Id: Ib989c185023820a443be0b3306a58e840a2167d9

There are no changes