Merge "Revert "Enable TripleBuffering on SF by default""

author Fabien Sanglard <sanglardf@google.com>

Tue, 7 Feb 2017 22:03:15 +0000 (22:03 +0000)

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

Tue, 7 Feb 2017 22:03:16 +0000 (22:03 +0000)
author Fabien Sanglard <sanglardf@google.com>
Tue, 7 Feb 2017 22:03:15 +0000 (22:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 7 Feb 2017 22:03:16 +0000 (22:03 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Fabien Sanglard <sanglardf@google.com>
	Tue, 7 Feb 2017 22:03:15 +0000 (22:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 7 Feb 2017 22:03:16 +0000 (22:03 +0000)