Commit e2f78c8a 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: a37e4c63 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib8d4f113425d8d6576101585546b0783ba97494c

There are no changes