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

Commit 2e38586a authored by Janis Danisevskis's avatar Janis Danisevskis Committed by android-build-merger
Browse files

Merge "Keymaster should be developed in AOSP" am: a5e28d6a am: e84234af...

Merge "Keymaster should be developed in AOSP" am: a5e28d6a am: e84234af am: 2657dcc1 am: f3fe582f
am: cf081b83

Change-Id: I9d51aa7eb651393af9c6f0504d3605711805c1cc
parents 995139c4 cf081b83
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -3,3 +3,8 @@ ignore_merged_commits = true

[Builtin Hooks]
clang_format = true

[Hook Scripts]
aosp_hook_confirmationui = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} confirmationui
aosp_hook_gatekeeper = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} gatekeeper
aosp_hook_keymaster = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} keymaster