Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de92cca authored by Adrian Roos's avatar Adrian Roos
Browse files

Merge commit 'e63ac36f' into master 

Add lockout after trying to enter PIN / Password too often
Bug: 13647935

Conflicts:
	src/com/android/settings/ConfirmLockPassword.java

Change-Id: I0bf69d6d7fa8d5be9ad0fb42fe500e0a377af53b
parents a2e7af91 e63ac36f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment