tree 2adc30973b7511fa56436596aca516f51a6ad4b3
parent b45e50a5bce5fba740318d056c8dd1fd9caed354
parent 2774144fa8283f1a7b43e17a53c97dec0c366dd3
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)