Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da28c6f4 authored by Atneya Nair's avatar Atneya Nair
Browse files

Merge "SoundTrigger OWNERS cleanup" am: 3445c76d am: a5b8acd1 am: 8d4f0e3a 

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: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 646c4e0f 8d4f0e3a

core/java/android/hardware/soundtrigger/OWNERS

+1 −2
Original line number Diff line number Diff line 
atneya@google.com

elaurent@google.com
 
include /media/java/android/media/soundtrigger/OWNERS

media/aidl/android/media/soundtrigger_middleware/OWNERS

+1 −2
Original line number Diff line number Diff line 
atneya@google.com

elaurent@google.com
 
include /media/java/android/media/soundtrigger/OWNERS

media/java/android/media/soundtrigger/OWNERS

+1 −0
Original line number Diff line number Diff line 
# Bug component: 48436

atneya@google.com

elaurent@google.com

services/voiceinteraction/OWNERS

+1 −0
Original line number Diff line number Diff line 
include /core/java/android/service/voice/OWNERS

include /media/java/android/media/soundtrigger/OWNERS

services/voiceinteraction/java/com/android/server/soundtrigger/OWNERS

+1 −2
Original line number Diff line number Diff line 
atneya@google.com

elaurent@google.com
 
include /media/java/android/media/soundtrigger/OWNERS