summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2020-12-22 16:54:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-22 16:54:47 +0000
commit1f4fff0881bf3941a6f2f4a8d511b1acf83db47c (patch)
treef34abf58ee084a398f339d9abce49ac5927d7b26
parentab3f2d3abab2d43aa82fbd231e5c1efda3b98359 (diff)
parent70544c6a7b5bc0bdab6cb22f11e31334f3a9aa93 (diff)
Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic117599e1b3ed79d387948210b65735c5ed52567
-rw-r--r--media/java/android/media/OWNERS1
-rw-r--r--services/tests/servicestests/src/com/android/server/audio/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/OWNERS b/media/java/android/media/OWNERS
index cbc9ab7e4adf..cf06fad3e203 100644
--- a/media/java/android/media/OWNERS
+++ b/media/java/android/media/OWNERS
@@ -6,3 +6,4 @@ lajos@google.com
olly@google.com
andrewlewis@google.com
sungsoo@google.com
+jmtrivi@google.com
diff --git a/services/tests/servicestests/src/com/android/server/audio/OWNERS b/services/tests/servicestests/src/com/android/server/audio/OWNERS
new file mode 100644
index 000000000000..894a1f5c25d0
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/audio/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/audio/OWNERS