tree 83205d361a4f2440ba2490932c45848b6bb69b38
parent 95c8b5a650c4e62f66c8f0e5490379247ceafdd6
parent 5a1a5a7b6494d2c96090ce6c76360a3367d0e65f
author Eric Laurent <elaurent@google.com> 1335470608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335470608 -0700

am 5a1a5a7b: Merge "AudioFlinger: fix tracks ready for mixing logic." into jb-dev

* commit '5a1a5a7b6494d2c96090ce6c76360a3367d0e65f':
  AudioFlinger: fix tracks ready for mixing logic.