Commit e908f883 authored Apr 22, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 22, 2021

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

am skip reason: subject contains skip directive

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

Change-Id: I2eb3a67276276504d359ae9051a070cd5c620663

There are no changes