Commit eeadee37 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: 6a2e87fd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib6c972cad914672d14bb33a3f8a34de720021841

There are no changes