| commit | b8ce91922e34e0c1fd98c5e129139f8b6249b931 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Mon Jan 23 15:18:41 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 23 15:18:41 2012 -0800 |
| tree | 1c47297a79c1bdefc859e3b36711061f73a2290e | |
| parent | bbb97e47d1a214304533710152cdf6c07702c24e [diff] | |
| parent | 5d76def68d135a4a0cf0a99a0fba7dad3e28c51a [diff] |
am 5d76def6: am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 * commit '5d76def68d135a4a0cf0a99a0fba7dad3e28c51a': DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"