summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2020-11-30 18:22:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-30 18:22:10 +0000
commitaea4eb1c6e6123bd9db3135f85b3de197bcc7f1c (patch)
tree4ee451b71435b6cf620fd374de36113018c86d30
parentd4e61ada2780eed1c6e922aac8f0dc4b2b4bcc9d (diff)
parent150418acaeb4da12e8957d223515fe97d6943547 (diff)
Merge "Revert "Add OWNERS block to facilitate in migration"" am: 2228195331 am: 150418acae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513010 Change-Id: Id6669017476e85eaf80d9a3ad19bf12b615bfdc4
-rw-r--r--cmds/statsd/src/OWNERS6
-rw-r--r--core/proto/OWNERS15
2 files changed, 0 insertions, 21 deletions
diff --git a/cmds/statsd/src/OWNERS b/cmds/statsd/src/OWNERS
deleted file mode 100644
index 0f3ddf7388d9..000000000000
--- a/cmds/statsd/src/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-# Temporary OWNERS Block to assist with migration
-# bug: 167962588
-per-file *atoms.proto = set noparent
-per-file *atom_field_options.proto = set noparent
-per-file *atoms.proto = baligh@google.com, yro@google.com, singhtejinder@google.com, jeffreyhuang@google.com
-per-file *atom_field_options.proto = baligh@google.com, yro@google.com, singhtejinder@google.com, jeffreyhuang@google.com
diff --git a/core/proto/OWNERS b/core/proto/OWNERS
index 5eeeb048e6d6..542d26fa233e 100644
--- a/core/proto/OWNERS
+++ b/core/proto/OWNERS
@@ -25,18 +25,3 @@ hyunyoungs@google.com
# Graphics stats
jreck@google.com
-
-# Temporary Block to assist in migration
-# Bug: 143080132
-per-file *enums.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *media_output_enum.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *networkcapabilities.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *data_stall_event.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *procstats_enum.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *usb.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *network_stack.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *tethering.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *dns_resolver.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *device_policy.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *launcher.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com
-per-file *mediametrics.proto = baligh@google.com, yro@google.com, jeffreyhuang@google.com