summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2023-03-06 19:18:48 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-03-06 19:18:48 +0000
commit56db2228c64d70b469180a0b36846eb28112bbbf (patch)
tree57639d30ef9bcc957d2c1b2cb66a125311c565e4
parent55ff23541917fedd5fee2a4475548a8f3396ab1c (diff)
parentb1bfb935d6baea742f799763f4c8247dac4385ea (diff)
Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32" into android13-tests-dev
-rw-r--r--media/java/android/media/projection/OWNERS2
-rw-r--r--services/core/java/com/android/server/media/projection/OWNERS3
-rw-r--r--services/tests/servicestests/src/com/android/server/media/projection/OWNERS1
3 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/projection/OWNERS b/media/java/android/media/projection/OWNERS
index 9ca391013aa3..2273f816ac60 100644
--- a/media/java/android/media/projection/OWNERS
+++ b/media/java/android/media/projection/OWNERS
@@ -1,2 +1,4 @@
michaelwr@google.com
santoscordon@google.com
+chaviw@google.com
+nmusgrave@google.com
diff --git a/services/core/java/com/android/server/media/projection/OWNERS b/services/core/java/com/android/server/media/projection/OWNERS
index 9ca391013aa3..832bcd9d70e6 100644
--- a/services/core/java/com/android/server/media/projection/OWNERS
+++ b/services/core/java/com/android/server/media/projection/OWNERS
@@ -1,2 +1 @@
-michaelwr@google.com
-santoscordon@google.com
+include /media/java/android/media/projection/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/media/projection/OWNERS b/services/tests/servicestests/src/com/android/server/media/projection/OWNERS
new file mode 100644
index 000000000000..832bcd9d70e6
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/media/projection/OWNERS
@@ -0,0 +1 @@
+include /media/java/android/media/projection/OWNERS