commit eaf46d2a00167f5a0bba3064ffe4eb01a9f7791a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 22 00:49:10 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 22 00:49:10 2024 +0000
tree 3f1ae7fa654210944c76db53d298b17d66e22648
parent f96d78f452e4501d9491421a1fa41e972bd3ae80
parent 2a2ea588ca41a1803c35dd8e6ba55bbd5c84d287

Merge "Clean up keystore owners" into main am: 6faa37113c am: 2a2ea588ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3315470

Change-Id: I3d67ebe574efc524df65065b3280bb41ba5718a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

keystore/java/android/security/OWNERS

diff --git a/keystore/java/android/security/OWNERS b/keystore/java/android/security/OWNERS
index 32759b2..4305286 100644
--- a/keystore/java/android/security/OWNERS
+++ b/keystore/java/android/security/OWNERS
@@ -1,2 +1,2 @@
-per-file *.java,*.aidl = eranm@google.com,pgrafov@google.com,rubinxu@google.com
+per-file *.java,*.aidl = drysdale@google.com,jbires@google.com,pgrafov@google.com,rubinxu@google.com
 per-file KeyStoreManager.java = mpgroover@google.com

keystore/tests/OWNERS

diff --git a/keystore/tests/OWNERS b/keystore/tests/OWNERS
index 86c31f4..0f94ddc 100644
--- a/keystore/tests/OWNERS
+++ b/keystore/tests/OWNERS
@@ -1,4 +1,7 @@
+# Android HW Trust team
+drysdale@google.com
+jbires@google.com
+
 # Android Enterprise security team
-eranm@google.com
 pgrafov@google.com
 rubinxu@google.com