| commit | 15dfda272eec983508b89fb8bc9ca6f2bb825496 | [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 | 0c98903df597cd0d08e6a40b1c11b78cde2d6cbd | |
| parent | a3db30f7c53936a3acb87d2c44807ee2f0cfa16e [diff] | |
| parent | 7baf7894bc2f1a62440f381eeb50143f210a5d61 [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)"