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