Merge "HWC2: Add properties to revert latching changes" into nyc-mr1-dev

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

Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)

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

Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Jul 2016 05:27:24 +0000 (05:27 +0000)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history