summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-08-27 18:15:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 18:15:21 +0000
commit6fe373b10ef2a2e56745ee2c67588e96f5b8dcad (patch)
tree46a6c7bc85fd8fb4d9c2974bd222f534432af37f /media
parent60220b77b920b1547620281b911f0911df1ea249 (diff)
parent16d7245b64062f4c65d55433642388d1dc9bdf70 (diff)
downloadframeworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.zip
frameworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.tar.gz
frameworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.tar.bz2
am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
* commit '16d7245b64062f4c65d55433642388d1dc9bdf70': Prevent Fingerprint when SIM is locked
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions