commit | 4f97e6933b529e3822fb3ef121a9f0139e7a04d7 | [log] [tgz] |
---|---|---|
author | Chris Elliott <chriselliott@google.com> | Mon Nov 03 21:20:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 21:20:43 2014 +0000 |
tree | 027cfc10ad08b846cc23557c94510882c65a5813 | |
parent | 0a978b70e95f8499831843b155d64fecc54208e8 [diff] | |
parent | 4b189fe2c22bc0079ec6d40947de9172c36f49eb [diff] |
am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d -s ours automerge: b2c3ad1 -s ours * commit '4b189fe2c22bc0079ec6d40947de9172c36f49eb':