OSDN Git Service

am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
authorEric Laurent <elaurent@google.com>
Thu, 19 Jan 2012 00:14:20 +0000 (16:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Jan 2012 00:14:20 +0000 (16:14 -0800)
commit60a5dfbfdee07988834f75b618687cfc993948ef
tree2c8839181a434754e4fc7de1c911643754614c59
parent4a9eb9628be8fdc441179394b7edca9bdce23ed3
parent2774144fa8283f1a7b43e17a53c97dec0c366dd3
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1

* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
  AudioFlinger: mix track only when really ready (2)
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h