tree c03ab4ab335a87783e3637c57a442257dea4c2fa
parent a017cf22583e4a5c911a765446f75f287a10fe06
parent 0df59eb1e69f5cd0de611e68f679c80e4253bf84
author Eric Laurent <elaurent@google.com> 1507676106 +0000
committer android-build-merger <android-build-merger@google.com> 1507676106 +0000

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e  -s ours am: 1fd129f457  -s ours am: a5d924154e  -s ours
am: 0df59eb1e6  -s ours

Change-Id: I59fdc987f539018ed423bff8bf26c393e66f3340