| commit | 66161272182e138412fcdcea32882ef509982c95 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Jan 25 08:57:20 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 25 08:57:20 2012 -0800 |
| tree | 1e8929040b814a6648119145260d7c8edfadde1f | |
| parent | 0cc595295cb3b58131da2d5babe650d6ee2261a8 [diff] | |
| parent | e628319fd5320e4f465020d2dbebdfa124549ff8 [diff] |
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 * commit 'dd347d515d4a4e42b2aba89a8e471392026b7824': DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""