| commit | b0965fada910ebf4b1dc10dbd351f383690fcdc9 | [log] [tgz] |
|---|---|---|
| author | Florian Mayer <fmayer@google.com> | Tue Mar 11 07:39:48 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 11 07:39:48 2025 -0700 |
| tree | 54a44f67a872162ae6a298a3129da93cf1cca0ce | |
| parent | 6c7b219cc99744c77fd49842e03ae873d127f24c [diff] | |
| parent | 2166b9a69b1bd3a957576046e6f0053e23b8fd58 [diff] |
Merge changes from topic "mteenabled" into main am: 7ea4c99263 am: 2166b9a69b Original change: https://android-review.googlesource.com/c/platform/bionic/+/3530461 Change-Id: I6d9e6e940d62ca4ee30fcdd1247646dd86cfbbb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index b4223ea..8aba6e4 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg
@@ -5,5 +5,4 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp [Hook Scripts] -aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "." notice = tools/update_notice.sh