Commit 6ab87158 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: b3ea9119 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie154cd998f230923be146807739437ea9a363395

There are no changes