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
FloatRect.h
FramebufferSurface.cpp	Frameworks/native: Wall Werror in surfaceflinger	2014-11-13 14:18:56 -08:00
FramebufferSurface.h
HWComposer.cpp
HWComposer.h
PowerHAL.cpp
PowerHAL.h
VirtualDisplaySurface.cpp
VirtualDisplaySurface.h	Frameworks/native: Wall Werror in surfaceflinger	2014-11-13 14:18:56 -08:00