commit dc8e0de6a93dc1581b269cec1483f85dfe2f4312
author Lalit Kansara <lkansara@codeaurora.org> Tue Dec 06 14:42:11 2016 +0530
committer Lalit Kansara <lkansara@codeaurora.org> Tue Dec 06 14:42:11 2016 +0530
tree 41ff60f16b428bb0d3bdf52d9bf375c3c9e1bbd6
parent 729fbabeb13103c9c0f9ab9642a88c5c13621aee
parent f14208e0390d8ee20ee4a5d7605d614e8b1abaf1

Merge commit 'f14208e0390d8ee20ee4a5d7605d614e8b1abaf1' into remote

Conflicts:
	include/gui/BufferQueueCore.h
	include/gui/BufferQueueProducer.h
	include/gui/IGraphicBufferProducer.h
	include/gui/Surface.h
	include/private/gui/LayerState.h
	libs/gui/IGraphicBufferProducer.cpp
	services/surfaceflinger/DisplayDevice.h
	services/surfaceflinger/DisplayHardware/HWC2.h
	services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
	services/surfaceflinger/SurfaceFlinger_hwc1.cpp

Change-Id: Ia0321a207080bee3697ac2f64012d3b2b13df56f