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

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I15f1d3b2196972713765f0570793b6e71f3bd1a1

...

This commit is contained in:

Treehugger Robot

2021-04-22 19:25:20 +00:00

committed by Automerger Merge Worker

parent 2527e8e270 b5b6d3680a

commit 167d95bed7

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