Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5de92cca6f79caa6ba48fe38a062099d63e5ae06
packages_apps_Settings/src
History
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
..
com/android/settings
Merge commit 'e63ac36f' into master
2014-04-03 17:05:36 +00:00