Merge "More work on issue #17656716: Unhandled exception in Window Manager" into...

author Dianne Hackborn <hackbod@google.com>

Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)

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

Thu, 2 Oct 2014 00:23:18 +0000 (00:23 +0000)
author Dianne Hackborn <hackbod@google.com>
Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 2 Oct 2014 00:23:18 +0000 (00:23 +0000)
diff --cc services/core/java/com/android/server/power/PowerManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 2 Oct 2014 00:23:18 +0000 (00:23 +0000)