[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 43a1b4cac2 -s ours am: 0d0783929a -s ours am: 5c0818d397 -s ours am: 5d4cad98ac -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Ife0f6909e75496d5f80a049c7d222848175dd986

...

This commit is contained in:

Treehugger Robot

2020-09-06 03:26:34 +00:00

committed by Automerger Merge Worker

parent 4062a506b7 5d4cad98ac

commit 308c7046d3

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