tree cd4281f83d3cd3bb783f781b648d35f764ffa9cf
parent 545996822e060b6b5421d6a0f1860d08cc5c3ce0
parent 620208dc0bbd7a0792702df3ab08800fdad60cec
author Chris Elliott <chriselliott@google.com> 1413411042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413411042 +0000

am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '620208dc0bbd7a0792702df3ab08800fdad60cec':
  audio: prevent larger than required sleeps - DO NOT MERGE