tree a441fe15f7df1a0c730d81de597d6685e4be61cb
parent af5ce977817b909ccbb77b09e6e8c57587423205
parent fa5253c8bc5cf3dc3395f500785015a340832f93
author Eric Laurent <elaurent@google.com> 1508450837 +0000
committer android-build-merger <android-build-merger@google.com> 1508450837 +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

Change-Id: I81fd60488c379d4aed791d2a1c6f2f99c8f51585