tree b8f41ed291b66d5ef0c1ab8628493bbf23eaba12
parent 00bb735e3716720e538eb3f45752bc9173a3b636
parent 721e18b75824eae3f3e79c915f4800ecad5dac80
author Eric Laurent <elaurent@google.com> 1338519696 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338519696 -0700

am 721e18b7: am 27d33134: Merge "Do not keep audio wake lock when apps underrun." into jb-dev

* commit '721e18b75824eae3f3e79c915f4800ecad5dac80':
  Do not keep audio wake lock when apps underrun.