Merge "surfaceflinger: fix -Wmismatched-tags warnings"

include/gui/ISurfaceComposer.h

@@ -38,7 +38,7 @@ namespace android {
 
 class ComposerState;
 class DisplayState;
-class DisplayInfo;
+struct DisplayInfo;
 class IDisplayEventConnection;
 class IMemoryHeap;
 class Rect;

services/surfaceflinger/DisplayDevice.h

@@ -37,7 +37,7 @@ struct ANativeWindow;
 
 namespace android {
 
-class DisplayInfo;
+struct DisplayInfo;
 class DisplaySurface;
 class IGraphicBufferProducer;
 class Layer;

services/surfaceflinger/DisplayHardware/HWComposer.h

@@ -196,7 +196,7 @@ public:
      * This behaves more or less like a forward iterator.
      */
     class LayerListIterator {
-        friend struct HWComposer;
+        friend class HWComposer;
         HWCLayer* const mLayerList;
         size_t mIndex;