tree 2c8839181a434754e4fc7de1c911643754614c59
parent b85a11467b3d46cb275fcc0d866619d36cda8662
parent eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac
author Eric Laurent <elaurent@google.com> 1327434675 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327434675 -0800

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)""