aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2022-10-27 17:34:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-27 17:34:14 +0000
commit7f43658eaafb644419b0fb7004f5263e968d11d5 (patch)
treeebed50ccae003724de1cc859d7c9e6600d7718aa
parentc259f009ae02c17aa784245732699cc089ea3f96 (diff)
parent1ea39aaca55ea440645649085efdeab11567c7ce (diff)
downloadminijail-7f43658eaafb644419b0fb7004f5263e968d11d5.tar.gz
Fix OWNERS setup am: 1ea39aaca5
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2271939 Change-Id: I8089cfbde0ea4dda4f4c52401e5899ce45107613 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--OWNERS5
-rw-r--r--OWNERS.android2
2 files changed, 4 insertions, 3 deletions
diff --git a/OWNERS b/OWNERS
index 5204cdc..39d7470 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,7 +1,10 @@
set noparent
# Android: exclude upstream owners so that code review requests will be routed
-# to OWNERS.android
+# to the Android/downstream owners below.
#include OWNERS_GENERAL
+adelva@google.com
+victorhsieh@google.com
+
# Emeritus.
#drewry@google.com
#keescook@google.com
diff --git a/OWNERS.android b/OWNERS.android
deleted file mode 100644
index b18cfc0..0000000
--- a/OWNERS.android
+++ /dev/null
@@ -1,2 +0,0 @@
-adelva@google.com
-victorhsieh@google.com