resolved conflicts for merge of 35c0bf31 to ics-aah

Change-Id: If736c93821359a2f97a0670ad3be8ada5f398bd7

diff --cc services/audioflinger/AudioFlinger.cpp
index ccac678,d617af8..75ddc46
--- 1/services/audioflinger/AudioFlinger.cpp
--- 2/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@@ -153,9 -150,8 +153,9 @@@ static const char *audio_interfaces[] 
  
  AudioFlinger::AudioFlinger()
      : BnAudioFlinger(),
 -        mPrimaryHardwareDev(0), mMasterVolume(1.0f), mMasterMute(false), mNextUniqueId(1),
 -        mBtNrecIsOff(false)
 +      mPrimaryHardwareDev(0), mMasterVolume(1.0f), mMasterVolumeSW(1.0f),
 +      mMasterVolumeSupportLvl(MVS_NONE), mMasterMute(false), mNextUniqueId(1),
-       mBtNrec(false)
++      mBtNrecIsOff(false)
  {
  }
  

diff --cc services/audioflinger/AudioFlinger.h
Simple merge