aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2022-10-27 19:02:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-27 19:02:16 +0000
commit8397ee8632ad65a545b69fa1e5be7c2cf6ecad13 (patch)
treeebed50ccae003724de1cc859d7c9e6600d7718aa
parente272838f0db29438c607065a2cb5bae75b0c33e7 (diff)
parent37139055f9f392e5a18547294c520355c1fa2153 (diff)
downloadminijail-8397ee8632ad65a545b69fa1e5be7c2cf6ecad13.tar.gz
Fix OWNERS setup am: 1ea39aaca5 am: 7f43658eaa am: 37139055f9
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2271939 Change-Id: If5bce6cf6714b92753db997a0501acc173e4ff3d 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