| commit | fc01736853f64f082eaaaa7b20e23429a770f75c | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 01:00:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:00:32 2014 +0000 |
| tree | e02f98e76d6eb7ef6c3a90a8c07eb59405c42776 | |
| parent | ae6855252dbc28254dc2351e8ce069259408f890 [diff] | |
| parent | 5e4215f5d7f78b5f6bffafc8a93a0f5575524b77 [diff] |
am 5e4215f5: am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf -s ours automerge: ed394bc -s ours automerge: 953705d -s ours * commit '5e4215f5d7f78b5f6bffafc8a93a0f5575524b77':