| commit | 5da85aa064f65d1fc90628bd6658ecd307e44725 | [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 | a4dec391951c077b0c84b2b6d03557af49046e3b | |
| parent | f06a99bbc159a691ad618865c4faecbf185371cd [diff] | |
| parent | 7c5aea0a8d9b422999483f96a2566f77ff11abf2 [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)""