tree e832aebee2231e5889f1350f01f857183b244d27
parent 6bc63e22b4a8ddbab7610ce5c9c288ef0efe9146
parent b013b15154603b132caa4b57dd3b4a00df3ad69b
author Eric Laurent <elaurent@google.com> 1507678651 +0000
committer android-build-merger <android-build-merger@google.com> 1507678651 +0000

Merge "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" into oc-mr1-dev-plus-aosp
am: b013b15154  -s ours

Change-Id: I26fb9db87c8c6980a802b24c5cefdbc140a8b1a1