tree 53dc78fede29d80887078d9cbe22be6e13cbde9b
parent 62f74ea593304bfa8a25a6e5c0c23da17df7f800
parent a95572e4a0f794fe5463bb18338ad70c8258cf72
author Andy Hung <hunga@google.com> 1508368320 +0000
committer android-build-merger <android-build-merger@google.com> 1508368320 +0000

Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am: 35a587cdc5 am: 27c4e661d4  -s ours am: ac43fbe5a6  -s ours am: f513923b38  -s ours am: a421c87781  -s ours am: 310807ff52  -s ours am: 25c38b2f40  -s ours am: 550c14e0a4  -s ours am: 99555160ee  -s ours am: a0fd1b9e00  -s ours am: d206dd91b0  -s ours am: b040d5f2e3  -s ours am: 4c1c9c8f5d  -s ours am: b845e3a3cb  -s ours
am: a95572e4a0  -s ours

Change-Id: I6f056bac45519225cab43bca9a2ba744899c2565