| commit | 15f743597f1dbff58992f32cd4c249514045c2c5 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 02:01:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 02:01:02 2014 +0000 |
| tree | 31c066f638a927643a0d090826a866ee3763675d | |
| parent | e0c1101cb69ee501dda68c7bc3edec26ba98a7c0 [diff] | |
| parent | 77ceb993504e18a2e40087c55d14e8934af05238 [diff] |
am 77ceb993: (-s ours) 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 '77ceb993504e18a2e40087c55d14e8934af05238':