| commit | 9c7d56a78ba819fdc8046ab87c82ee2b57d200b5 | [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 | 9a2b57c6a390d36dba8982e7c1742c81c69307b9 | |
| parent | afacb33f7584ca2f762c2d15472917059c0e9503 [diff] | |
| parent | dd347d515d4a4e42b2aba89a8e471392026b7824 [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)""