OSDN Git Service

am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 20 Aug 2015 02:25:13 +0000 (02:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 02:25:13 +0000 (02:25 +0000)
commit6b13b0aa85de6d0d4decafa9a652b2b8ebbaee27
tree00e29cb899d465d40d4476169ca9b5aa10fe8298
parent31e6448bb42341e796293473077609ceea265a22
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