diff options
| author | 2023-08-23 09:44:16 +0000 | |
|---|---|---|
| committer | 2023-08-23 09:44:16 +0000 | |
| commit | ee82fb1f18677a9df65f29494ab02d3d4c1bae84 (patch) | |
| tree | 4a813e135ba9c30a1a6300a70daaf8df78394b71 | |
| parent | 22399c4f96c2307d45d909d1bb93d6c67301a00d (diff) | |
| parent | d9e72502b1b7f46d2c973b4298199a5b0ed92340 (diff) | |
Merge "Update OWNERS for android/security/" into main am: 1a7824743b am: 132c183baf am: d9e72502b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2705333
Change-Id: Ibe2b37fd96ba939ad2b4d1adc6584131e132a407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/security/OWNERS | 11 | ||||
| -rw-r--r-- | core/java/android/security/net/OWNERS | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/security/OWNERS b/core/java/android/security/OWNERS index dd17788c7811..22b1f026e2ae 100644 --- a/core/java/android/security/OWNERS +++ b/core/java/android/security/OWNERS @@ -1,10 +1,9 @@ # Bug component: 36824 -cbrubaker@google.com -vishwath@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 |