tree d68a30c87b827f904549a157aee5818221639053
parent 9da6c242c6979a52bccb60776b993b2282461b0c
parent 8610f49c1a14c91550c8abde27bda59ac6526b23
author Eric Laurent <elaurent@google.com> 1412716225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412716225 +0000

am 8610f49c: am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev

* commit '8610f49c1a14c91550c8abde27bda59ac6526b23':
  audio policy: fix lockup during mediaserver restart