Commit 70e59c5f authored Sep 06, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 06, 2020

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

am skip reason: subject contains skip directive

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

Change-Id: Ibb5d2cbfa9a9a1d065759a07ba4c34862bbdee51

There are no changes