| commit | e0c1101cb69ee501dda68c7bc3edec26ba98a7c0 | [log] [tgz] |
|---|---|---|
| author | Haynes Mathew George <hgeorge@codeaurora.org> | Tue Nov 04 02:01:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 02:01:01 2014 +0000 |
| tree | 31c066f638a927643a0d090826a866ee3763675d | |
| parent | c6c1a3f54fb6282737fd4630de89b774ebc10277 [diff] | |
| parent | 3f026400a3de1a409d078129e3380d0e1fb8c747 [diff] |
am 3f026400: (-s ours) am a0dcc12e: am 398a2c54: am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c -s ours automerge: 52ea677 -s ours automerge: d20609f -s ours * commit '3f026400a3de1a409d078129e3380d0e1fb8c747':