summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eran Messeri <eranm@google.com> 2020-12-14 14:26:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-14 14:26:22 +0000
commitfeb6b04243d9e212972f478c902bce7659f37de9 (patch)
tree9abaa8a634abe98f4d07198934d9478d91cde14a
parent09f483415d330e925e8ea6b264bef5f2abff0a39 (diff)
parentf4555b5fe2dc61137390c8adb970c86a74aaf160 (diff)
Merge "Device Policy Manager OWNERS: Add Enterprise team" am: f4555b5fe2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519669 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d02f8200d5379f2f062d8192acfbdd8454b0cff
-rw-r--r--core/java/android/app/admin/OWNERS9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/app/admin/OWNERS b/core/java/android/app/admin/OWNERS
index 64a1d27d4cf7..8462cbe7497b 100644
--- a/core/java/android/app/admin/OWNERS
+++ b/core/java/android/app/admin/OWNERS
@@ -1,4 +1,11 @@
# Bug component: 142675
-yamasani@google.com
+# Android Enterprise team
rubinxu@google.com
+sandness@google.com
+eranm@google.com
+alexkershaw@google.com
+pgrafov@google.com
+
+# Emeritus
+yamasani@google.com