summaryrefslogtreecommitdiffstats
path: root/location/tests/locationtests
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-19 01:32:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-19 01:32:24 +0000
commitce6fb7bba967a9b33e5d3afe60fff66c5b2ca034 (patch)
tree376cc5b8f7038f72af435053c38f455d4e151d73 /location/tests/locationtests
parent1d9a8c58d8a68027eec950875700550600e3e46b (diff)
parent7ef772713fac5d7b69874f2b972cdec7a60f074b (diff)
downloadframeworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.zip
frameworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.tar.gz
frameworks_base-ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034.tar.bz2
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 'location/tests/locationtests')
0 files changed, 0 insertions, 0 deletions