summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-02 21:43:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-02 21:43:25 +0000
commitc98836fb5b2dad4a84e373b4d40cd68d16f1b084 (patch)
treed3e806753665a60024c7e340656f346260719776
parent160da75fc3eaf86456dddf68dca8d8ebfedb0073 (diff)
parentae8367414046c1d2e1371f6a26a1bfbcccd6f444 (diff)
downloadbase-android-cts-12.1_r8.tar.gz
Merge "Snap for 9679243 from 9a4ae94a324315ea16eb23b3e53b8ec98a3888cc to android12L-tests-release" into android12L-tests-releaseandroid-vts-12.1_r7android-vts-12.1_r6android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6
-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