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

Browse Source

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e3d54066ae32552ca0dcec369a5185dcc52aff0

...

This commit is contained in:

Treehugger Robot

2020-12-20 19:12:06 +00:00

committed by Automerger Merge Worker

parent 327f96aa66 698ecf415a

commit 9d2abd766e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available