tree 1aa3f492b81e9b7834babf095188ce9eb4439621
parent 1fcbd9b0e973d662ed566967af71c8f5b2383320
parent 6919fbe40d92af432d3b72ad36e0697654f8146c
author Zach Jang <zachjang@google.com> 1445913181 +0000
committer android-build-merger <android-build-merger@google.com> 1445913181 +0000

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

* commit '6919fbe40d92af432d3b72ad36e0697654f8146c':
  Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""