summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-01 18:20:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-01 18:20:04 +0000
commitdcf85bf11a1dd3c0497dd098014d8cb4df2bdd94 (patch)
tree6c2006e85ffb42341e17a1128d1f55cc75bfe3f3
parent533e4e9b352f0129aa45e005a2bd34d184afae47 (diff)
parentbb0e40a3b42cb4fb07a7cc67541f1966f674cff8 (diff)
downloadbase-dcf85bf11a1dd3c0497dd098014d8cb4df2bdd94.tar.gz
Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev
-rw-r--r--media/java/android/media/projection/OWNERS3
-rw-r--r--services/core/java/com/android/server/media/projection/OWNERS2
-rw-r--r--services/tests/servicestests/src/com/android/server/media/projection/OWNERS1
3 files changed, 5 insertions, 1 deletions
diff --git a/media/java/android/media/projection/OWNERS b/media/java/android/media/projection/OWNERS
index 7e7335d68d3b..2273f816ac60 100644
--- a/media/java/android/media/projection/OWNERS
+++ b/media/java/android/media/projection/OWNERS
@@ -1 +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 7e7335d68d3b..832bcd9d70e6 100644
--- a/services/core/java/com/android/server/media/projection/OWNERS
+++ b/services/core/java/com/android/server/media/projection/OWNERS
@@ -1 +1 @@
-michaelwr@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