diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-01 18:58:00 +0000 |
|---|---|---|
| committer | Naomi Musgrave <nmusgrave@google.com> | 2023-03-02 21:20:59 +0000 |
| commit | b1bfb935d6baea742f799763f4c8247dac4385ea (patch) | |
| tree | 57639d30ef9bcc957d2c1b2cb66a125311c565e4 | |
| parent | 55ff23541917fedd5fee2a4475548a8f3396ab1c (diff) | |
| parent | 9a4ae94a324315ea16eb23b3e53b8ec98a3888cc (diff) | |
| download | base-b1bfb935d6baea742f799763f4c8247dac4385ea.tar.gz | |
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
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290
Change-Id: Ie77d4f7cabfd0af7c6c2f154ac4fa4f72c77a366
Merged-In: I72b11d6a1f180c44565b50f3f4e8d2673fde3fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 |