Merge "Fix deadlock when updating rotation" into mnc-dr-dev

author Chong Zhang <chz@google.com>

Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)

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

Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)
author Chong Zhang <chz@google.com>
Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)