diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 01:32:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:32:24 +0000 |
| commit | ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034 (patch) | |
| tree | 376cc5b8f7038f72af435053c38f455d4e151d73 /tools/aapt2/diff/Diff.cpp | |
| parent | 1d9a8c58d8a68027eec950875700550600e3e46b (diff) | |
| parent | 7ef772713fac5d7b69874f2b972cdec7a60f074b (diff) | |
am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions