OSDN Git Service

am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc...
authorAndres Morales <anmorales@google.com>
Wed, 16 Sep 2015 16:18:25 +0000 (16:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 16:18:25 +0000 (16:18 +0000)
commit8d9ba684982cb2e1d2d86e77484bc8772c8ff328
tree7e71550f2b0f8f13edc98a0a98fc78fc676ec582
parentea196888a0a1a9c0e67aa809676a12a7d0cb955e
parent5b78fda91e33b4fc8de5f0a8ab894941202c42cb
am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev

* commit '5b78fda91e33b4fc8de5f0a8ab894941202c42cb':
  reset lockout deadline on device reboot