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)
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
  AudioFlinger: mix track only when really ready (2)

1  2 
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h

Simple merge