tree a441fe15f7df1a0c730d81de597d6685e4be61cb
parent 57ac76182e675e8ae79c249bdeaa496987648adb
parent 74684f638b29417c46543eacd21872d9a3141caf
author Eric Laurent <elaurent@google.com> 1508450798 +0000
committer android-build-merger <android-build-merger@google.com> 1508450798 +0000

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb
am: 74684f638b

Change-Id: I5c11295c9b097f8d359f221023e1bb1a03b7cb8f