| commit | 5f9cd7966202b36cfbd795271b3cae78410fb2ad | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 02:01:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 02:01:04 2014 +0000 |
| tree | 31c066f638a927643a0d090826a866ee3763675d | |
| parent | 08a950e58e0f01514a6770144dfa0a0ef67f0e13 [diff] | |
| parent | 40cda8ddf697047a99f17689a7a65a62061b99d3 [diff] |
am 40cda8dd: (-s ours) 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 '40cda8ddf697047a99f17689a7a65a62061b99d3':