tree ca9743cc23131cc45690f93570d15217e21eb45a
parent 7b6231a44e21fbf5b2bc2a5eff2231139ac4088f
parent db2e71635968f455ad4f41b2e24fb8b909c24ca0
author Eric Laurent <elaurent@google.com> 1326931686 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326931686 -0800

am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1

* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
  AudioFlinger: mix track only when really ready (2)