tree 3359ed12b0377f69f981e07bbaaf8c206630e381
parent 7f2c9e9420252a493b7399639f794c8a963444e5
author Adrian Roos <roosa@google.com> 1394467211 +0100
committer Adrian Roos <roosa@google.com> 1394718149 +0000

DO NOT MERGE - Fix keyguard pattern lockout bug

(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945