commit | 7c5aea0a8d9b422999483f96a2566f77ff11abf2 | [log] [tgz] |
---|---|---|
author | Eric Laurent <elaurent@google.com> | Tue Jan 24 11:51:47 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 24 11:51:47 2012 -0800 |
tree | be8c3dc3c8d2a781020eba7fb165c440f81ff38c | |
parent | d9f088521782f071fc615df0ebbc80e53e21b2b1 [diff] | |
parent | eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac [diff] |
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 * commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2': DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""