| commit | 08a950e58e0f01514a6770144dfa0a0ef67f0e13 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 02:01:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 02:01:03 2014 +0000 |
| tree | 31c066f638a927643a0d090826a866ee3763675d | |
| parent | 15f743597f1dbff58992f32cd4c249514045c2c5 [diff] | |
| parent | fbf219445f5d921d22f094d30851250b9a76c32e [diff] |
am fbf21944: (-s ours) am ae685525: am c7eca4e8: am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d -s ours automerge: b2c3ad1 -s ours automerge: 4f97e69 -s ours * commit 'fbf219445f5d921d22f094d30851250b9a76c32e':