Commit 70c9ae22 authored Sep 04, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 04, 2020

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

am skip reason: subject contains skip directive

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

Change-Id: I496b1e4589084ed8826b392fa99c72e360fc01fc

There are no changes