summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorEvan Severson <evanseverson@google.com>2021-03-02 21:40:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-02 21:40:58 +0000
commitd35d84c8fcdbb71d66277a4e196b94b3d5a95447 (patch)
treeceeb3b83712ca66f1266bfe818de641e09836377 /core/java
parent5dd48a49e90166fb857babe585b6a832533da90c (diff)
parent391145ab8534c367c9d40a0aa08cbf40b45d334a (diff)
Merge "Update permissions OWNERS files" am: 391145ab85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99f1eefce42cc8717be7c9834b685e53dec813ce
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/permission/OWNERS8
-rw-r--r--core/java/android/permission/OWNERS8
-rw-r--r--core/java/android/permissionpresenterservice/OWNERS6
3 files changed, 11 insertions, 11 deletions
diff --git a/core/java/android/content/pm/permission/OWNERS b/core/java/android/content/pm/permission/OWNERS
index d302b0ae1ea8..cf7e6890876a 100644
--- a/core/java/android/content/pm/permission/OWNERS
+++ b/core/java/android/content/pm/permission/OWNERS
@@ -1,10 +1,8 @@
# Bug component: 137825
+include platform/frameworks/base:/core/java/android/permission/OWNERS
+
toddke@android.com
toddke@google.com
patb@google.com
-svetoslavganov@android.com
-svetoslavganov@google.com
-zhanghai@google.com
-evanseverson@google.com
-ntmyren@google.com
+
diff --git a/core/java/android/permission/OWNERS b/core/java/android/permission/OWNERS
index b32346848a69..19a3a8bd514a 100644
--- a/core/java/android/permission/OWNERS
+++ b/core/java/android/permission/OWNERS
@@ -1,7 +1,13 @@
# Bug component: 137825
+eugenesusla@google.com
evanseverson@google.com
+evanxinchen@google.com
+ewol@google.com
+guojing@google.com
+jaysullivan@google.com
ntmyren@google.com
-zhanghai@google.com
svetoslavganov@android.com
svetoslavganov@google.com
+theianchen@google.com
+zhanghai@google.com
diff --git a/core/java/android/permissionpresenterservice/OWNERS b/core/java/android/permissionpresenterservice/OWNERS
index b32346848a69..fb6099cf7e5a 100644
--- a/core/java/android/permissionpresenterservice/OWNERS
+++ b/core/java/android/permissionpresenterservice/OWNERS
@@ -1,7 +1,3 @@
# Bug component: 137825
-evanseverson@google.com
-ntmyren@google.com
-zhanghai@google.com
-svetoslavganov@android.com
-svetoslavganov@google.com
+include platform/frameworks/base:/core/java/android/permission/OWNERS