Commit 9d42ce68 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: 6fb53d53 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id167ad5004d62cc86dc0c729d4adfedc6c150022

There are no changes