| commit | bd1b8756295539dd329b9eb41a9e5d2bbb805108 | [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 | 68884c65ce2ef12682ea5dc68b73fb61c319ad8e | |
| parent | 80a0d2de0a7db5cdcaf40fe33b14523b65d19423 [diff] | |
| parent | 15dfda272eec983508b89fb8bc9ca6f2bb825496 [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)"