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

Commit cce3bb52 authored by Vladimir Marko's avatar Vladimir Marko
Browse files

resolve merge conflicts of 6f0d5e0d to sc-dev 

Test: N/A
Bug: None
Change-Id: I88560c8b73cff8b5dab5f0d53af026651e8952d0
parents 62c5a29e 6f0d5e0d

core/java/android/hardware/soundtrigger/OWNERS

+2 −1
Original line number Diff line number Diff line 
include /core/java/android/media/soundtrigger/OWNERS
 
ytai@google.com

elaurent@google.com

media/java/android/media/soundtrigger/OWNERS

+1 −0
Original line number Diff line number Diff line 
ytai@google.com

elaurent@google.com

services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS

+1 −1
Original line number Diff line number Diff line 
include /core/java/android/media/soundtrigger/OWNERS
 
include /media/aidl/android/media/soundtrigger_middleware/OWNERS