| commit | 7ef6ae3b9b6b3a72f9929911ee19fbcf5cf17cfb | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Mon Jan 23 15:13:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 23 15:13:19 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | 3f92dbe932d2a4e601fe1c238e87d33a81dc7a85 [diff] | |
| parent | 7ebc940ec579ad840adfe88ef6cdff522245649b [diff] |
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 * commit 'fee5a860a8355cda071ff23644e943414ba7f65d': DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"