Merge "SurfaceFlinger: Add exclusion list for captureLayers." into qt-dev

author Rob Carr <racarr@google.com>

Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)

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

Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)
author Rob Carr <racarr@google.com>
Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)
diff --cc core/java/android/view/SurfaceControl.java
Simple merge
diff --cc core/jni/android_view_SurfaceControl.cpp
Simple merge
author	Rob Carr <racarr@google.com>
	Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 5 Apr 2019 18:47:40 +0000 (18:47 +0000)
		1	2
core/java/android/view/SurfaceControl.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/android_view_SurfaceControl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history