diff options
| author | 2023-03-30 17:19:51 +0000 | |
|---|---|---|
| committer | 2023-03-30 10:40:54 -0700 | |
| commit | da28c6f44d361acabf0501f763d218cb50c018d5 (patch) | |
| tree | 1cdc45cb35b50c256e3254c27d89a7464c6675b0 | |
| parent | 646c4e0fe89b6ae54965b912c3b44fd740f7f32c (diff) | |
| parent | 8d4f0e3adafe3bc09da3d76e268a1a4bbf7ed6cc (diff) | |
Merge "SoundTrigger OWNERS cleanup" am: 3445c76d33 am: a5b8acd19e am: 8d4f0e3ada
Manual merge-fix to remove now deleted files.
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2510575
Change-Id: I2a2e98640da817cbea66c25b4c29040da4a9988e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/hardware/soundtrigger/OWNERS | 3 | ||||
| -rw-r--r-- | media/aidl/android/media/soundtrigger_middleware/OWNERS | 3 | ||||
| -rw-r--r-- | media/java/android/media/soundtrigger/OWNERS | 1 | ||||
| -rw-r--r-- | services/voiceinteraction/OWNERS | 1 | ||||
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS | 3 | ||||
| -rw-r--r-- | tests/SoundTriggerTestApp/OWNERS | 2 | ||||
| -rw-r--r-- | tests/SoundTriggerTests/OWNERS | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/core/java/android/hardware/soundtrigger/OWNERS b/core/java/android/hardware/soundtrigger/OWNERS index 01b2cb981bbb..1e41886fe716 100644 --- a/core/java/android/hardware/soundtrigger/OWNERS +++ b/core/java/android/hardware/soundtrigger/OWNERS @@ -1,2 +1 @@ -atneya@google.com -elaurent@google.com +include /media/java/android/media/soundtrigger/OWNERS diff --git a/media/aidl/android/media/soundtrigger_middleware/OWNERS b/media/aidl/android/media/soundtrigger_middleware/OWNERS index 01b2cb981bbb..1e41886fe716 100644 --- a/media/aidl/android/media/soundtrigger_middleware/OWNERS +++ b/media/aidl/android/media/soundtrigger_middleware/OWNERS @@ -1,2 +1 @@ -atneya@google.com -elaurent@google.com +include /media/java/android/media/soundtrigger/OWNERS diff --git a/media/java/android/media/soundtrigger/OWNERS b/media/java/android/media/soundtrigger/OWNERS index 01b2cb981bbb..85f7a4d605e6 100644 --- a/media/java/android/media/soundtrigger/OWNERS +++ b/media/java/android/media/soundtrigger/OWNERS @@ -1,2 +1,3 @@ +# Bug component: 48436 atneya@google.com elaurent@google.com diff --git a/services/voiceinteraction/OWNERS b/services/voiceinteraction/OWNERS index ef1061b28b63..40e8d26931e1 100644 --- a/services/voiceinteraction/OWNERS +++ b/services/voiceinteraction/OWNERS @@ -1 +1,2 @@ include /core/java/android/service/voice/OWNERS +include /media/java/android/media/soundtrigger/OWNERS diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS b/services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS index 01b2cb981bbb..1e41886fe716 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS @@ -1,2 +1 @@ -atneya@google.com -elaurent@google.com +include /media/java/android/media/soundtrigger/OWNERS diff --git a/tests/SoundTriggerTestApp/OWNERS b/tests/SoundTriggerTestApp/OWNERS index 9db19a37812b..a0fcfc52704d 100644 --- a/tests/SoundTriggerTestApp/OWNERS +++ b/tests/SoundTriggerTestApp/OWNERS @@ -1,2 +1,2 @@ -include /core/java/android/media/soundtrigger/OWNERS +include /media/java/android/media/soundtrigger/OWNERS mdooley@google.com diff --git a/tests/SoundTriggerTests/OWNERS b/tests/SoundTriggerTests/OWNERS index 816bc6bba639..1e41886fe716 100644 --- a/tests/SoundTriggerTests/OWNERS +++ b/tests/SoundTriggerTests/OWNERS @@ -1 +1 @@ -include /core/java/android/media/soundtrigger/OWNERS +include /media/java/android/media/soundtrigger/OWNERS |