OSDN Git Service

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp...
authorEric Laurent <elaurent@google.com>
Thu, 19 Oct 2017 23:16:33 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 23:16:33 +0000 (23:16 +0000)
commitc75c947a4211648505376ecfa28dcb55e1c16b64
tree902fd00ab7e967e39f7eb28ee8897672cc47322c
parent0b306b0517ba8dee58583f920102ba87393e5ed3
parent1ade78dc5dbe8d61e8bfb34b227a868ab470ae16
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb am: 74684f638b am: af5ce97781 am: 7190597c26 am: 5de64b02a3  -s ours am: 2ed01f0006  -s ours
am: 1ade78dc5d  -s ours

Change-Id: Iaee2ff65a346cc0f8aafc5c7bd07e6467fb791ed