commit | 5b78fda91e33b4fc8de5f0a8ab894941202c42cb | [log] [tgz] |
---|---|---|
author | Andres Morales <anmorales@google.com> | Wed Sep 16 16:12:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 16:12:03 2015 +0000 |
tree | 2c16bae4122fedbcbe75dc36d6705e1ddc9e37bc | |
parent | e1ab0999cdcb719480200ea6be71a60f58ce90f4 [diff] | |
parent | 38e6e4ef98ea1f116902725c282df9fb061a224e [diff] |
am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev * commit '38e6e4ef98ea1f116902725c282df9fb061a224e': reset lockout deadline on device reboot