summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-21 23:59:44 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-21 23:59:44 +0000
commit6faa37113c69eef5b0f1b49e4ba84db7927241e2 (patch)
tree6701fba381d74b91eedd9563055052aaf5f5a87f
parentf098e278ed7d5c59f51ea589541d9ae80aa4386d (diff)
parent753133d0c16330da1ace026e52ae2e2181f3a583 (diff)
Merge "Clean up keystore owners" into main
-rw-r--r--keystore/java/android/security/OWNERS2
-rw-r--r--keystore/tests/OWNERS5
2 files changed, 5 insertions, 2 deletions
diff --git a/keystore/java/android/security/OWNERS b/keystore/java/android/security/OWNERS
index 32759b2402a9..43052866b938 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
diff --git a/keystore/tests/OWNERS b/keystore/tests/OWNERS
index 86c31f403da0..0f94ddcee47f 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