Commit 8b88af9e 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: 8fdafb83 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I970d0e28e1480fb9d58dab23accd91e73baa5197

There are no changes