summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-18 00:48:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-18 00:48:47 +0000
commit5c2bfa8ff08331a2a62a1dd7496331eb977c0f13 (patch)
tree42c3645c45fa7ab244ed5bb2bb424e04b9c6f508 /telephony
parentdc09ffad2a7a68e96eadec0f81611b3538ef78a5 (diff)
parent58e378b02561d8f606066537b193b0eb62e2404f (diff)
downloadframeworks_base-5c2bfa8ff08331a2a62a1dd7496331eb977c0f13.zip
frameworks_base-5c2bfa8ff08331a2a62a1dd7496331eb977c0f13.tar.gz
frameworks_base-5c2bfa8ff08331a2a62a1dd7496331eb977c0f13.tar.bz2
am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
* commit '58e378b02561d8f606066537b193b0eb62e2404f': Start fingerprint authentication in onStartedGoingToSleep
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions