summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-20 02:17:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 02:17:26 +0000
commit60931a784ff5c7659a432ed7b4f5ea5a22156637 (patch)
tree3baeb408939a71f5137357e5c74aed8a066ee495 /packages/Keyguard
parente6983e877888dd51abe090b75fa568a64e9fc16e (diff)
parentdc4442f1a698017dc5c700969392497cbc934126 (diff)
downloadframeworks_base-60931a784ff5c7659a432ed7b4f5ea5a22156637.zip
frameworks_base-60931a784ff5c7659a432ed7b4f5ea5a22156637.tar.gz
frameworks_base-60931a784ff5c7659a432ed7b4f5ea5a22156637.tar.bz2
am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit 'dc4442f1a698017dc5c700969392497cbc934126': Fix issue #23361510: Increase assist timeout from 500ms to 1 second
Diffstat (limited to 'packages/Keyguard')
0 files changed, 0 insertions, 0 deletions