diff options
| author | Andres Morales <anmorales@google.com> | 2015-09-16 16:18:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 16:18:25 +0000 |
| commit | 8d9ba684982cb2e1d2d86e77484bc8772c8ff328 (patch) | |
| tree | 7e71550f2b0f8f13edc98a0a98fc78fc676ec582 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ea196888a0a1a9c0e67aa809676a12a7d0cb955e (diff) | |
| parent | 5b78fda91e33b4fc8de5f0a8ab894941202c42cb (diff) | |
am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '5b78fda91e33b4fc8de5f0a8ab894941202c42cb':
reset lockout deadline on device reboot
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions