Disallow use of error-prone merge-strategies am: 6631354fb3 am: 43f8af4e49 am: 49b14f7a76

Browse Source

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1602054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If872ed9cebcef8dbe8d1754db1be8fe7dd478972

...

This commit is contained in:

Anton Hansson

2021-02-23 21:00:22 +00:00

committed by Automerger Merge Worker

parent 5794fcc158 49b14f7a76

commit e9e0f75c7e

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