OSDN Git Service

Merge "Remove the notion of "active track" from mixer"
authorGlenn Kasten <gkasten@google.com>
Thu, 5 Jan 2012 16:20:10 +0000 (08:20 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 5 Jan 2012 16:20:10 +0000 (08:20 -0800)
commit88592eccaf6afcddd5f985955be92fe25205c680
tree5a1795bd7aefe20d332f7388d8cddcadc3df841a
parenta2a0a5d7d56baa831870f4bf2a0d942a477d92ef
parent9c56d4ae6212c21ce5fd71ed534eb195983a07c1
Merge "Remove the notion of "active track" from mixer"
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioMixer.cpp
services/audioflinger/AudioMixer.h