Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)

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

Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)
diff --cc services/surfaceflinger/DisplayDevice.h
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 3 Aug 2017 12:45:02 +0000 (12:45 +0000)
		1	2
services/surfaceflinger/DisplayDevice.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history