Merge "Revert "get rid of IGraphicBufferAlloc""

author Chia-I Wu <olv@google.com>

Mon, 13 Mar 2017 21:02:24 +0000 (21:02 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 13 Mar 2017 21:02:25 +0000 (21:02 +0000)
author Chia-I Wu <olv@google.com>
Mon, 13 Mar 2017 21:02:24 +0000 (21:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 13 Mar 2017 21:02:25 +0000 (21:02 +0000)
diff --cc services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
Simple merge
diff --cc services/surfaceflinger/Layer.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge
author	Chia-I Wu <olv@google.com>
	Mon, 13 Mar 2017 21:02:24 +0000 (21:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 13 Mar 2017 21:02:25 +0000 (21:02 +0000)
		1	2
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/Layer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger_hwc1.cpp	patch \|	diff1 \|	diff2 \|	blob \| history