summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-03-01 18:19:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-01 18:19:43 +0000
commitbb0e40a3b42cb4fb07a7cc67541f1966f674cff8 (patch)
tree6c2006e85ffb42341e17a1128d1f55cc75bfe3f3
parent533e4e9b352f0129aa45e005a2bd34d184afae47 (diff)
parentd6533d0bf9e4d4321b0cd1bafafaf40ab48097db (diff)
downloadbase-bb0e40a3b42cb4fb07a7cc67541f1966f674cff8.tar.gz
Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: I8e1ccc4a9e481c8859ef265a34ef309f56679f52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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