Files
packages_apps_Settings/src
Adrian Roos 5de92cca6f 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
2014-04-03 17:05:36 +00:00
..