Andreas Gampe 4037c458a7 resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp ... Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41		2014-11-13 15:16:53 -08:00
..
DisplaySurface.h	Allow for resizing of Virtual Displays.	2014-07-30 14:36:25 -07:00
FloatRect.h	fix SF buffer cropping	2013-07-10 15:08:29 -07:00
FramebufferSurface.cpp	Frameworks/native: Wall Werror in surfaceflinger	2014-11-13 14:18:56 -08:00
FramebufferSurface.h	Add a BufferItem parameter to onFrameAvailable	2014-11-07 10:39:13 -08:00
HWComposer.cpp	surfaceflinger: Use landscape resolution for default dpi	2014-09-28 22:26:28 +00:00
HWComposer.h	surfaceflinger: fix -Wmismatched-tags warnings	2014-10-31 09:51:10 -07:00
PowerHAL.cpp	SurfaceFlinger: send VSYNC power hints to IPowerManager	2014-06-18 18:51:24 -07:00
PowerHAL.h	SurfaceFlinger: send VSYNC power hints to IPowerManager	2014-06-18 18:51:24 -07:00
VirtualDisplaySurface.cpp	Build fix to use the correct source.	2014-07-30 15:39:17 -07:00
VirtualDisplaySurface.h	Frameworks/native: Wall Werror in surfaceflinger	2014-11-13 14:18:56 -08:00