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