OSDN Git Service

am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 20 Aug 2015 02:24:56 +0000 (02:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 02:24:56 +0000 (02:24 +0000)
commita2737beea11455c48b719c6d2f26d5908d4b8cd2
tree09e69eb7246426e33dede84206138eb9d4de4adb
parentdc4442f1a698017dc5c700969392497cbc934126
parent1fa7384a101450c4619ed43e176d5a54aa0a54f3
am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev

* commit '1fa7384a101450c4619ed43e176d5a54aa0a54f3':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint