| commit | 4386a6b01a09b16cf3600b53ab3f4402ba257bce | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 01:00:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:00:30 2014 +0000 |
| tree | e02f98e76d6eb7ef6c3a90a8c07eb59405c42776 | |
| parent | a0dcc12eb66253ab6ce2493e108c65fcf993be62 [diff] | |
| parent | 3baa9d08ad2ec5afd4c1cdd48942aeb74b5428d7 [diff] |
am 3baa9d08: am 1aed5c92: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: 2feb18d -s ours automerge: bb92112 -s ours automerge: 0a978b7 -s ours * commit '3baa9d08ad2ec5afd4c1cdd48942aeb74b5428d7':