| commit | 3b715ce887d01845b3da7d8c1212dae60da231a5 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 16:27:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 16:27:09 2015 +0000 |
| tree | 2f59dd691dbba8837fbdf6c0512d58d743fa71d7 | |
| parent | f69c37dd3433b6a32d5bf703a6ad98b0c3a853fc [diff] | |
| parent | 8d9ba684982cb2e1d2d86e77484bc8772c8ff328 [diff] |
am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev * commit '8d9ba684982cb2e1d2d86e77484bc8772c8ff328': reset lockout deadline on device reboot