Commit 47c1d3f7 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: 8d9e8ba8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2925d55ed851b91137de7e23ef87cff710083f93

There are no changes