tree 65cf6d88750a8ee8b21e60e3c0d884e872f3ca26
parent 9dc1dbba55f0fc9a20a5e9e069a4d0d43b636a4e
parent 6777e539f0479ed8ca13bfeed63edf9402b00655
author Eric Laurent <elaurent@google.com> 1347570716 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347570716 -0700

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

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