tree 82a331d346e84f6600c69239c57c996713fa1542
parent 2ed01f00065b01b8c2a03a15d068d6bd04740bb9
parent 37e801176e3e41cc9c9be1b1b414b12e458c4977
author Eric Laurent <elaurent@google.com> 1508453178 +0000
committer android-build-merger <android-build-merger@google.com> 1508453178 +0000

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am: 1a721bb633  -s ours am: 5a1dae0cea  -s ours am: fa5253c8bc  -s ours am: 021923a373  -s ours am: c798254fba  -s ours
am: 37e801176e  -s ours

Change-Id: Iba51d0f957ad1277547089df074b148056d91970