tree 9a2b57c6a390d36dba8982e7c1742c81c69307b9
parent afacb33f7584ca2f762c2d15472917059c0e9503
parent dd347d515d4a4e42b2aba89a8e471392026b7824
author Eric Laurent <elaurent@google.com> 1327510640 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327510640 -0800

am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1

* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""