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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1799a1817d9b2b0729c4219f651f5b9b8d55d6b
This commit is contained in:
Treehugger Robot
2020-12-20 20:28:41 +00:00
committed by Automerger Merge Worker

Diff Content Not Available