tree 1aa3f492b81e9b7834babf095188ce9eb4439621
parent dee38ac0da6716903f039166d621184d67c8afd3
parent 8c5b71ce473517ea1270f6467fa518274bd54b35
author Zach Jang <zachjang@google.com> 1445913362 +0000
committer android-build-merger <android-build-merger@google.com> 1445913362 +0000

Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev am: 6919fbe40d
am: 8c5b71ce47

* commit '8c5b71ce473517ea1270f6467fa518274bd54b35':
  Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""