Merge "Remove unnecessary friend declarations"

diff --cc services/audioflinger/AudioFlinger.h
index 141a31e,a38d48b..5049364
--- 1/services/audioflinger/AudioFlinger.h
--- 2/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@@ -929,18 -906,9 +915,12 @@@ public
          virtual     void        saveOutputTracks() { }
          virtual     void        clearOutputTracks() { }
  
 +        // Cache various calculated values, at threadLoop() entry and after a parameter change
 +        virtual     void        cacheParameters_l();
 +
      private:
  
-         friend class AudioFlinger;
-         friend class OutputTrack;
-         friend class Track;
-         friend class TrackBase;
-         friend class MixerThread;
-         friend class DirectOutputThread;
-         friend class DuplicatingThread;
+         friend class AudioFlinger;      // for numerous
  
          PlaybackThread(const Client&);
          PlaybackThread& operator = (const PlaybackThread&);