Commit 49a17ddc authored Jan 02, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jan 02, 2021

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I822511f0535631b765c8fce1e131109be2b8415b

parents 6d37ae9e 7b26ef1f

There are no changes