Merge "SurfaceFlinger: Last minute log removal." into oc-dev

author Robert Carr <racarr@google.com>

Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)
author Robert Carr <racarr@google.com>
Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)
diff --cc services/surfaceflinger/Layer.cpp

index 5aed896,88a5bd4..273f194

mode 100755,100644..100755
--- 1/services/surfaceflinger/Layer.cpp
--- 2/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
author	Robert Carr <racarr@google.com>
	Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)