Merge tag 'android-7.1.2_r27' into nougat-x86

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

Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)

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

Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)
diff --cc libs/gui/IGraphicBufferProducer.cpp
Simple merge
diff --cc libs/gui/Surface.cpp
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Tue, 18 Jul 2017 05:49:31 +0000 (13:49 +0800)
		1	2
libs/gui/IGraphicBufferProducer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/gui/Surface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history