summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-08-31 19:03:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-31 19:03:39 +0000
commit542c95130eb4a91fd223361b44c7adb3f7ee404f (patch)
treed387b55d158773b43781f0c6f928e7eac939c3a7
parente29dc9dfe148b46d0b3f838aebb941f92bab59fe (diff)
parent7c25a55f5ddd05e04d9fdd04845bb752b5f2c833 (diff)
Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778 Change-Id: Iaa9997aafcf6058e83a3d9286ec2bd2015d2efbe
-rwxr-xr-xtools/aosp/aosp_sha.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh
index 3cdb27c74d63..ac23c3d9cb4a 100755
--- a/tools/aosp/aosp_sha.sh
+++ b/tools/aosp/aosp_sha.sh
@@ -35,6 +35,7 @@ else
echo
echo "If your change contains no confidential details (such as security fixes), please"
echo "upload and merge this change at https://android-review.googlesource.com/."
+ echo "Else add a tag 'Ignore-AOSP-First:' with the reason to bypass AOSP."
echo
exit 1
fi