OSDN Git Service

am 3b715ce8: am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline...
authorAndres Morales <anmorales@google.com>
Wed, 16 Sep 2015 16:33:59 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 16:33:59 +0000 (16:33 +0000)
commit3dee67f35c9895ec48a954e3dfb631c088efaa47
treed418b30d96f14db2431024677cd8ec858026bc0e
parent3c73070aaeca1eefd9cab702002ae508d2ccb567
parent3b715ce887d01845b3da7d8c1212dae60da231a5
am 3b715ce8: am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev

* commit '3b715ce887d01845b3da7d8c1212dae60da231a5':
  reset lockout deadline on device reboot
core/java/com/android/internal/widget/LockPatternUtils.java