summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2020-12-16 22:26:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-16 22:26:46 +0000
commit0d2b2dd166cb7d49d52e0dbc659ec6260768d76d (patch)
treec917d69d921e5992380b76b1e3b2e16985beab71 /core/java
parent861a168777d5926b3365c5b2977b42bfd267c817 (diff)
parent2fb83e12c757083534dfb4da3026ac30978f2b22 (diff)
Merge "Add owners for Protected Confirmation implementation." am: 9bb6231bd2 am: 2fb83e12c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532298 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e1a0e4e468ab07a2238af11e53ef221985ddbe2
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/security/OWNERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/security/OWNERS b/core/java/android/security/OWNERS
index 3f8d75e6118d..7140ff12be64 100644
--- a/core/java/android/security/OWNERS
+++ b/core/java/android/security/OWNERS
@@ -7,3 +7,5 @@ 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 Confirmation*.java = jdanis@google.com
+per-file Confirmation*.java = swillden@google.com