Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev

author Craig Mautner <cmautner@google.com>

Thu, 29 Nov 2012 17:57:14 +0000 (09:57 -0800)

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

Thu, 29 Nov 2012 17:57:15 +0000 (09:57 -0800)
author Craig Mautner <cmautner@google.com>
Thu, 29 Nov 2012 17:57:14 +0000 (09:57 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Nov 2012 17:57:15 +0000 (09:57 -0800)
diff --cc services/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Thu, 29 Nov 2012 17:57:14 +0000 (09:57 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Nov 2012 17:57:15 +0000 (09:57 -0800)