OSDN Git Service

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
authorEric Laurent <elaurent@google.com>
Tue, 10 Oct 2017 22:22:05 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Oct 2017 22:22:05 +0000 (22:22 +0000)
am: 960f0f335e  -s ours

Change-Id: I9e99134af75cc2f03eaec7e8686ee1ab04c678ed


Trivial merge