tree 9a2dd281a4b2c19acbcc2d9cbfdbb6adec8db88e
parent f449ea9e96162698f4ec6d62c70750eb50744da7
parent 0b0896555827d2a5a9c8240f27dd94e8933dd778
author Eric Laurent <elaurent@google.com> 1327434556 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1327434556 -0800

Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1