From: Lajos Molnar <lajos@google.com>
Date: Fri, 19 Sep 2014 03:09:39 +0000 (-0700)
Subject: resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp
X-Git-Tag: android-x86-7.1-r1~1005^2~209
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=435d9cde2777950c1d93b0982839d6796c5688b2;p=android-x86%2Fframeworks-native.git

resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp

Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
---

435d9cde2777950c1d93b0982839d6796c5688b2
diff --cc include/gui/ISurfaceComposer.h
index 430a409fca,3ffc67e697..f04a848377
--- a/include/gui/ISurfaceComposer.h
+++ b/include/gui/ISurfaceComposer.h
@@@ -38,7 -38,8 +38,8 @@@ namespace android 
  
  class ComposerState;
  class DisplayState;
 -class DisplayInfo;
 -class DisplayStatInfo;
 +struct DisplayInfo;
++struct DisplayStatInfo;
  class IDisplayEventConnection;
  class IMemoryHeap;
  class Rect;