Merge "Fix password unlock method" into lmp-dev

author Jorim Jaggi <jjaggi@google.com>

Mon, 25 Aug 2014 16:09:21 +0000 (16:09 +0000)

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

Mon, 25 Aug 2014 16:09:23 +0000 (16:09 +0000)
author Jorim Jaggi <jjaggi@google.com>
Mon, 25 Aug 2014 16:09:21 +0000 (16:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 25 Aug 2014 16:09:23 +0000 (16:09 +0000)
diff --cc policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Mon, 25 Aug 2014 16:09:21 +0000 (16:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 25 Aug 2014 16:09:23 +0000 (16:09 +0000)