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

Commit 439a250c authored by Vladimir Marko's avatar Vladimir Marko Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 6f0d5e0d to... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13711945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83aa065889b60d4ef5bce472a1541fc0c220d917
parents 5fa9c483 b098ec22

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