am fb017a4c: Merge "Fix clang warnings about struct vs. class."

* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
  Fix clang warnings about struct vs. class.

diff --cc include/gui/ISurfaceComposer.h
index 742fc83,ffc44c7..430a409
--- 1/include/gui/ISurfaceComposer.h
--- 2/include/gui/ISurfaceComposer.h
+++ b/include/gui/ISurfaceComposer.h
@@@ -38,10 -35,9 +38,10 @@@ namespace android 
  
  class ComposerState;
  class DisplayState;
- class DisplayInfo;
+ struct DisplayInfo;
  class IDisplayEventConnection;
  class IMemoryHeap;
 +class Rect;
  
  /*
   * This class defines the Binder IPC interface for accessing various

diff --cc services/surfaceflinger/DisplayDevice.h
Simple merge

diff --cc services/surfaceflinger/DisplayHardware/HWComposer.h
Simple merge