summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-07-07 23:21:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-07 23:21:47 +0000
commit29b48c22e17b24149c891719bb9b481228a2dde0 (patch)
treed819b2202c96a1381a6cef99463f719ef994c847 /packages/VpnDialogs
parent6b27136de3639a21c17124eceb39b34aba10517a (diff)
parent412733811c34d8b581b8fcded130072cbb34e184 (diff)
downloadframeworks_base-29b48c22e17b24149c891719bb9b481228a2dde0.zip
frameworks_base-29b48c22e17b24149c891719bb9b481228a2dde0.tar.gz
frameworks_base-29b48c22e17b24149c891719bb9b481228a2dde0.tar.bz2
am 41273381: am 1075a27c: am b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev
* commit '412733811c34d8b581b8fcded130072cbb34e184': SystemUI/Keyguard: try authenticate finger after authentication failure
Diffstat (limited to 'packages/VpnDialogs')
0 files changed, 0 insertions, 0 deletions