summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bram Bonné <brambonne@google.com> 2023-08-23 13:18:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-23 13:18:49 +0000
commitd4e11615867890ba9551a91eb3991d67183ce11c (patch)
treee276c9e1e189914ff5294baecf969cffca362940
parentc2ef64da746a252a0e5ad739732961692190d280 (diff)
parentca05666d9fbb76e027b6dbcbe419521b669673a6 (diff)
Merge "Merge "Update OWNERS for android/security/" into main am: 1a7824743b am: 132c183baf am: d9e72502b1 am: ee82fb1f18 am: 47fae1ebcc" into main
-rw-r--r--core/java/android/security/OWNERS10
-rw-r--r--core/java/android/security/net/OWNERS2
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/security/OWNERS b/core/java/android/security/OWNERS
index 4e8d6e70091c..22b1f026e2ae 100644
--- a/core/java/android/security/OWNERS
+++ b/core/java/android/security/OWNERS
@@ -1,9 +1,9 @@
# Bug component: 36824
-cbrubaker@google.com
+brambonne@google.com
+brufino@google.com
+jeffv@google.com
-per-file NetworkSecurityPolicy.java = cbrubaker@google.com
-per-file NetworkSecurityPolicy.java = klyubin@google.com
-per-file FrameworkNetworkSecurityPolicy.java = cbrubaker@google.com
-per-file FrameworkNetworkSecurityPolicy.java = klyubin@google.com
+per-file *NetworkSecurityPolicy.java = file:net/OWNERS
per-file Confirmation*.java = file:/keystore/OWNERS
+per-file FileIntegrityManager.java = victorhsieh@google.com
diff --git a/core/java/android/security/net/OWNERS b/core/java/android/security/net/OWNERS
index d8281645738b..1d52eed0cb56 100644
--- a/core/java/android/security/net/OWNERS
+++ b/core/java/android/security/net/OWNERS
@@ -1,4 +1,4 @@
# Bug component: 36824
-cbrubaker@google.com
brambonne@google.com
+jeffv@google.com