| commit | e628319fd5320e4f465020d2dbebdfa124549ff8 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Tue Jan 24 11:51:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 24 11:51:47 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | b945a6844bac53609269d28273ab00c64d103d7c [diff] | |
| parent | 95460d7cbc1507cb1908643172b1aadc82cca6cf [diff] |
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 * commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2': DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""