Commit 67d36471 authored Feb 24, 2021 by Anton Hansson Committed by Automerger Merge Worker Feb 24, 2021

Merge "Disallow use of error-prone merge-strategies" am: 68892c49 am: b862d094 am: cb9ea5b0

Original change: https://android-review.googlesource.com/c/platform/build/+/1602016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic623ee16e0bfecabeeb28adc75cb1adacb365a9d

parents f18ec161 cb9ea5b0

PREUPLOAD.cfg

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		[Hook Scripts]
		do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}