summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-01 18:41:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-01 18:41:37 +0000
commitca129ab8999048309d7dca3a18c574b1fa47187b (patch)
treed3e806753665a60024c7e340656f346260719776
parentec91f356083c36c110d2b56b812fb74108b5377f (diff)
parentdcf85bf11a1dd3c0497dd098014d8cb4df2bdd94 (diff)
downloadbase-ca129ab8999048309d7dca3a18c574b1fa47187b.tar.gz
Merge "Merge "Update OWNERS for MediaProjection & related classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: I3cdca3c7980fa84bf8fd64d1e33dd375d18fe764 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