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

Commit b098ec22 authored by Vladimir Marko's avatar Vladimir Marko Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 6f0d5e0d to sc-dev" into sc-dev

parents 712239d4 cce3bb52

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