Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145...

author Bryce Lee <brycelee@google.com>

Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)

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

Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)
author Bryce Lee <brycelee@google.com>
Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)
diff --cc services/core/java/com/android/server/wm/DisplayContent.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)
		1	2
services/core/java/com/android/server/wm/DisplayContent.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history