Commit 336114b4 authored Dec 06, 2020 by Treehugger Robot Committed by Automerger Merge Worker Dec 06, 2020

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

am skip reason: subject contains skip directive

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

Change-Id: Ibcafcd45189026a4f8ba513565c8cab5f247ac28

There are no changes