| commit | 40cda8ddf697047a99f17689a7a65a62061b99d3 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 01:28:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:28:07 2014 +0000 |
| tree | 6772b4c8a268c6fcd5a96bbaa2c3a0ff651bb918 | |
| parent | fbf219445f5d921d22f094d30851250b9a76c32e [diff] | |
| parent | fc01736853f64f082eaaaa7b20e23429a770f75c [diff] |
am fc017368: 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 'fc01736853f64f082eaaaa7b20e23429a770f75c':