Merge "Prefer default orientation for secondary displays" into pi-dev

author Andrii Kulian <akulian@google.com>

Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)

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

Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)
author Andrii Kulian <akulian@google.com>
Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)
		1	2
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history