tree e685c17ba9cca9069a4d2e39a1090ec00b7328a7
parent 013b82a0f9e278595d5296baa73be7cae0e68b18
parent 05c0d7d71be9578ad59d71f07f84e08c09e8d73a
author Chris Elliott <chriselliott@google.com> 1413416465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413416465 +0000

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

* commit '05c0d7d71be9578ad59d71f07f84e08c09e8d73a':
  audio: prevent larger than required sleeps - DO NOT MERGE