Merge "Only showing important security messages in status area (issue 7341795)" into...

author Adam Cohen <adamcohen@google.com>

Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)

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

Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)
author Adam Cohen <adamcohen@google.com>
Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)
diff --cc policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)