Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev

author Craig Mautner <cmautner@google.com>

Wed, 4 Jun 2014 00:21:00 +0000 (00:21 +0000)

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

Wed, 4 Jun 2014 00:21:01 +0000 (00:21 +0000)
author Craig Mautner <cmautner@google.com>
Wed, 4 Jun 2014 00:21:00 +0000 (00:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jun 2014 00:21:01 +0000 (00:21 +0000)
diff --cc policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Wed, 4 Jun 2014 00:21:00 +0000 (00:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 4 Jun 2014 00:21:01 +0000 (00:21 +0000)