Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b862d094 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa777b5cc115ecdefadffe1548884b9834a00f43
parents 16de8e81 68892c49
Loading
Loading
Loading
Loading

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}