Disallow use of error-prone merge-strategies am: 6631354fb3 am: 43f8af4e49 am: 97e09af968
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1602054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e98d93ebfd11d62cbbe7b3774f1adcd28c7c852
This commit is contained in:
2
PREUPLOAD.cfg
Normal file
2
PREUPLOAD.cfg
Normal file
@@ -0,0 +1,2 @@
|
||||
[Hook Scripts]
|
||||
do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}
|
||||
Reference in New Issue
Block a user