commit 5c6cf337568890ca8a5290024f048432b8f3618b
author Eric Laurent <elaurent@google.com> Fri Oct 20 18:02:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 18:02:39 2017 +0000
tree 442bcf007f10f7696e08151f345d31b98e32b989
parent 620e622cd319eacf4081614878d5de167bae3cfe
parent 502c695e582e3ba32a5af6ab045c5bde5b2c3fda

Merge "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 am: 021923a373  -s ours am: c798254fba  -s ours am: 37e801176e  -s ours am: 63b868e27b  -s ours am: 68d7af9137  -s ours am: 4efb8774ab  -s ours am: 94a417ca10  -s ours am: 8fc33c4f75  -s ours am: ec248b8ddd  -s ours am: 8334241619  -s ours am: ca252eecd7  -s ours" into oc-mr1-dev-plus-aosp
am: 502c695e58  -s ours

Change-Id: I363f2709e0f6459688396d5163a6521a3d3cc104