tree 4fbaa3dfaae09044735fdc00cba3f33da57ff002
parent 0af80a133bf101921cbdd66b263bddbcdae33542
parent f8c5023fd3200aaf79293bdbab264d09b0936d54
author Eric Laurent <elaurent@google.com> 1347554399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347554399 -0700

am f4bca03d: Merge "Don\'t deadlock on AudioRecord start when reads return 0" into jb-mr1-dev

* commit 'f4bca03d996b584030a80268f58cdb29dc7b7cde':
  Don't deadlock on AudioRecord start when reads return 0