| commit | b85a11467b3d46cb275fcc0d866619d36cda8662 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Mon Jan 23 15:13:50 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 23 15:13:50 2012 -0800 |
| tree | 6664d5fcb31273378375c3967e81b78b85a6eb29 | |
| parent | 60a5dfbfdee07988834f75b618687cfc993948ef [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)"