Merge tag 'android-8.1.0_r18' into oreo-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 7 Mar 2018 08:40:40 +0000 (16:40 +0800)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history