tree 6772b4c8a268c6fcd5a96bbaa2c3a0ff651bb918
parent fbee43b19506f97f35ead6c0ce19dc11d5ccdc3a
parent a0dcc12eb66253ab6ce2493e108c65fcf993be62
author Haynes Mathew George <hgeorge@codeaurora.org> 1415064484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415064484 +0000

am a0dcc12e: am 398a2c54: am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c  -s ours automerge: 52ea677  -s ours automerge: d20609f  -s ours

* commit 'a0dcc12eb66253ab6ce2493e108c65fcf993be62':