OSDN Git Service

resolved conflicts for merge of 1a4b9939 to master
authorEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
committerEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
commit7ab41c9f773ba599646f1b0d00955c1be80f92fd
tree02a8e0276a550d6748b64e6b4e165dd562712859
parentb8a805261bf0282e992d3608035e47d05a898710
parentfe0698f9d44ca923ff1ba528f2c42019937ea5e2
resolved conflicts for merge of 1a4b9939 to master

Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioMixer.cpp
services/audioflinger/AudioMixer.h