summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2020-09-08 19:20:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-08 19:20:53 +0000
commitf3670cc3d3c25e159dc231c599147cff586a9399 (patch)
treeac863269f96ee55a7a75713a1d239b5362241470
parent27e25ee89e3eb07c49c47d3b2a5cb02bd1f6d57c (diff)
parent33082d4490676f45ba4036bbb6ac6c03225a98bf (diff)
Merge "Update OWNERS" am: 33082d4490
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418955 Change-Id: Ia358e7f028c9fbbb80aa03e714f652c251a6fd9b
-rw-r--r--services/core/java/com/android/server/telecom/OWNERS6
-rw-r--r--telecomm/OWNERS5
2 files changed, 9 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/telecom/OWNERS b/services/core/java/com/android/server/telecom/OWNERS
new file mode 100644
index 000000000000..39be2c1aecc4
--- /dev/null
+++ b/services/core/java/com/android/server/telecom/OWNERS
@@ -0,0 +1,6 @@
+breadley@google.com
+hallliu@google.com
+tgunn@google.com
+xiaotonj@google.com
+shuoq@google.com
+rgreenwalt@google.com
diff --git a/telecomm/OWNERS b/telecomm/OWNERS
index 673a0a9b558e..9969ee965fbd 100644
--- a/telecomm/OWNERS
+++ b/telecomm/OWNERS
@@ -1,7 +1,8 @@
set noparent
-tgunn@google.com
breadley@google.com
hallliu@google.com
+tgunn@google.com
+xiaotonj@google.com
+shuoq@google.com
rgreenwalt@google.com
-paulye@google.com