tree fffa8c7461659ba0ecb7329ee00f344c712f9e89
parent 3cc02e7e6549ce89febb8acdec665ac0a7d089ee
parent 92d161a2770015f3bc27058b7e24724c87bc7f60
author Eric Laurent <elaurent@google.com> 1508521413 +0000
committer android-build-merger <android-build-merger@google.com> 1508521413 +0000

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 am: c75c947a42  -s ours am: 849a10fce0  -s ours am: faee2cdf2d  -s ours am: 836b713352  -s ours am: 24e679966e  -s ours
am: 92d161a277  -s ours

Change-Id: Ief556ab8326a2ae72c31c6372795bc58c6eb81b1