Merge changes from topic 'layer-wp-race' into oc-dev

author Chia-I Wu <olv@google.com>

Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)

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

Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)
author Chia-I Wu <olv@google.com>
Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)
diff --cc services/surfaceflinger/Layer.cpp

index 36747c7,022b416..b4d6dca

mode 100755,100644..100755
--- 1/services/surfaceflinger/Layer.cpp
--- 2/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
author	Chia-I Wu <olv@google.com>
	Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)