tree 027cfc10ad08b846cc23557c94510882c65a5813
parent 4f97e6933b529e3822fb3ef121a9f0139e7a04d7
parent 9c356efa84e6fa756ebcce88ea192921f1a0da3e
author Chris Elliott <chriselliott@google.com> 1415049644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415049644 +0000

am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf  -s ours automerge: ed394bc  -s ours

* commit '9c356efa84e6fa756ebcce88ea192921f1a0da3e':