tree ec9d907e012f33a936192e7c7123e93b17e13655
parent 74684f638b29417c46543eacd21872d9a3141caf
parent 5a1dae0cea7af32752cb5457bbdaeaea05a25919
author Eric Laurent <elaurent@google.com> 1508450260 +0000
committer android-build-merger <android-build-merger@google.com> 1508450260 +0000

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

Change-Id: If398ae680d0e7fd71a10894d3609fabdff700cc2