commit 11cb70a372026502fc8cfbc54bf4865231416892
author Eric Laurent <elaurent@google.com> Fri Oct 20 18:06:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 18:06:29 2017 +0000
tree 442bcf007f10f7696e08151f345d31b98e32b989
parent 5c6cf337568890ca8a5290024f048432b8f3618b
parent 73a3fba4dd418c6b089231235b531365d5f8685f

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: 20ddd7f5c1  -s ours" into oc-mr1-dev-plus-aosp
am: 73a3fba4dd  -s ours

Change-Id: I607428e66174b562e3d272b71ea8e7b77c3f0d01