Merge "Use configuration delta to determine if still in orientation change." into...

author Bryce Lee <brycelee@google.com>

Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)

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

Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)
author Bryce Lee <brycelee@google.com>
Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)
		1	2
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowState.java	patch \|	diff1 \|	diff2 \|	blob \| history