| commit | ae6855252dbc28254dc2351e8ce069259408f890 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Nov 04 01:00:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:00:31 2014 +0000 |
| tree | e02f98e76d6eb7ef6c3a90a8c07eb59405c42776 | |
| parent | 4386a6b01a09b16cf3600b53ab3f4402ba257bce [diff] | |
| parent | c7eca4e8ea8c6cd6d1a96404331c2119c1dd556e [diff] |
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 'c7eca4e8ea8c6cd6d1a96404331c2119c1dd556e':