summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2019-03-09 06:04:09 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-09 06:04:09 -0800
commita7de534a93310dec10112f9e15668c742f795d7a (patch)
treecb50757724cc48171c2ea47090f6a42732d7d000
parent3fcab6197ba424944c9ce2c1c50a76ffd973c765 (diff)
parent6f6fc4083929c16f1cebf0a933284bddbe6f88c6 (diff)
Merge "Add junyulai@ as owner of the core networking dirs" am: e5e3ac639b am: b0498ba448
am: 6f6fc40839 Change-Id: I5902959b76797a58884480e3fd219ba53497ae8e
-rw-r--r--core/java/android/net/OWNERS5
-rw-r--r--core/java/com/android/server/net/OWNERS2
-rw-r--r--native/android/OWNERS2
-rw-r--r--packages/CaptivePortalLogin/OWNERS2
-rw-r--r--packages/NetworkStack/OWNERS1
-rw-r--r--services/core/java/com/android/server/net/OWNERS3
-rw-r--r--services/net/OWNERS2
-rw-r--r--tests/net/OWNERS2
8 files changed, 9 insertions, 10 deletions
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS
index 15f4913c5419..a1c7fce67d30 100644
--- a/core/java/android/net/OWNERS
+++ b/core/java/android/net/OWNERS
@@ -1,12 +1,11 @@
set noparent
codewiz@google.com
-ek@google.com
-jsharkey@android.com
jchalard@google.com
+jsharkey@android.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
-silberst@google.com
per-file SSL*, Uri*, Url* = flooey@google.com, narayan@google.com, tobiast@google.com
diff --git a/core/java/com/android/server/net/OWNERS b/core/java/com/android/server/net/OWNERS
index 7311eee32a4c..d3836d4c6c57 100644
--- a/core/java/com/android/server/net/OWNERS
+++ b/core/java/com/android/server/net/OWNERS
@@ -1,8 +1,8 @@
set noparent
codewiz@google.com
-ek@google.com
jchalard@google.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
diff --git a/native/android/OWNERS b/native/android/OWNERS
index b3f50aab7503..266764a6f607 100644
--- a/native/android/OWNERS
+++ b/native/android/OWNERS
@@ -1,4 +1,4 @@
set noparent
-per-file libandroid_net.map.txt, net.c = codewiz@google.com, ek@google.com, jchalard@google.com
+per-file libandroid_net.map.txt, net.c = codewiz@google.com, jchalard@google.com, junyulai@google.com
per-file libandroid_net.map.txt, net.c = lorenzo@google.com, reminv@google.com, satk@google.com
diff --git a/packages/CaptivePortalLogin/OWNERS b/packages/CaptivePortalLogin/OWNERS
index 7311eee32a4c..d3836d4c6c57 100644
--- a/packages/CaptivePortalLogin/OWNERS
+++ b/packages/CaptivePortalLogin/OWNERS
@@ -1,8 +1,8 @@
set noparent
codewiz@google.com
-ek@google.com
jchalard@google.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
diff --git a/packages/NetworkStack/OWNERS b/packages/NetworkStack/OWNERS
index a395465e5f21..0e1e65df818f 100644
--- a/packages/NetworkStack/OWNERS
+++ b/packages/NetworkStack/OWNERS
@@ -1,5 +1,6 @@
codewiz@google.com
jchalard@google.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS
index 2e91f998076d..28ae6a417bd3 100644
--- a/services/core/java/com/android/server/net/OWNERS
+++ b/services/core/java/com/android/server/net/OWNERS
@@ -1,12 +1,11 @@
set noparent
codewiz@google.com
-ek@google.com
jchalard@google.com
jsharkey@android.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
-silberst@google.com
sudheersai@google.com
yamasani@google.com
diff --git a/services/net/OWNERS b/services/net/OWNERS
index 7311eee32a4c..d3836d4c6c57 100644
--- a/services/net/OWNERS
+++ b/services/net/OWNERS
@@ -1,8 +1,8 @@
set noparent
codewiz@google.com
-ek@google.com
jchalard@google.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com
diff --git a/tests/net/OWNERS b/tests/net/OWNERS
index 7311eee32a4c..d3836d4c6c57 100644
--- a/tests/net/OWNERS
+++ b/tests/net/OWNERS
@@ -1,8 +1,8 @@
set noparent
codewiz@google.com
-ek@google.com
jchalard@google.com
+junyulai@google.com
lorenzo@google.com
reminv@google.com
satk@google.com