summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-09-03 19:08:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 19:08:53 +0000
commitb90f1de216ec8be27eebd17b5f3c6a87ee084e75 (patch)
tree8d9dd08a8a023c5fc15234b2d4112fdf71215b69 /packages/Keyguard
parentcb92577aa6201abbba2d2f17c8cc8d99d9754e8b (diff)
parent1b5cc3a4ba46029b798adb9e362d87df5673bc52 (diff)
downloadframeworks_base-b90f1de216ec8be27eebd17b5f3c6a87ee084e75.zip
frameworks_base-b90f1de216ec8be27eebd17b5f3c6a87ee084e75.tar.gz
frameworks_base-b90f1de216ec8be27eebd17b5f3c6a87ee084e75.tar.bz2
am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52': Show face unlock even when fingerprint is running
Diffstat (limited to 'packages/Keyguard')
0 files changed, 0 insertions, 0 deletions