| commit | 77ceb993504e18a2e40087c55d14e8934af05238 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 01:28:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:28:05 2014 +0000 |
| tree | 6772b4c8a268c6fcd5a96bbaa2c3a0ff651bb918 | |
| parent | 3f026400a3de1a409d078129e3380d0e1fb8c747 [diff] | |
| parent | 4386a6b01a09b16cf3600b53ab3f4402ba257bce [diff] |
am 4386a6b0: 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 '4386a6b01a09b16cf3600b53ab3f4402ba257bce':