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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf3bdec14fb2d25eb2912a7eaf16292636cc46ce
This commit is contained in:
Anton Hansson
2021-02-23 19:37:49 +00:00
committed by Automerger Merge Worker

2
PREUPLOAD.cfg Normal file
View 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}