tree a6f363d2862a1877f91a1ec61822677dda7db5b6
parent b6b4443dbb21480e0191de3db55048f1dd772b1d
parent 1a721bb633761c8e78c49f597e6868bee1080882
author Eric Laurent <elaurent@google.com> 1507673303 +0000
committer android-build-merger <android-build-merger@google.com> 1507673303 +0000

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev
am: 1a721bb633  -s ours

Change-Id: I1cb6bfc9221a5e095b4aa9db8745fdf183a8ddbf