diff options
| author | Andres Morales <anmorales@google.com> | 2015-09-16 16:33:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 16:33:59 +0000 |
| commit | 3dee67f35c9895ec48a954e3dfb631c088efaa47 (patch) | |
| tree | d418b30d96f14db2431024677cd8ec858026bc0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3c73070aaeca1eefd9cab702002ae508d2ccb567 (diff) | |
| parent | 3b715ce887d01845b3da7d8c1212dae60da231a5 (diff) | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions