tree fffa8c7461659ba0ecb7329ee00f344c712f9e89
parent 502c695e582e3ba32a5af6ab045c5bde5b2c3fda
parent 01a7ee03aed89f27621215dbf4e86a00bac3433c
author Android Build Merger (Role) <android-build-merger@google.com> 1508521562 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1508521562 +0000

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