OSDN Git Service

am 0c152b9e: (-s ours) am 30c5da9c: Don\'t call cancel() when fingerprint auth fails
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 09:32:02 +0000 (09:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:32:02 +0000 (09:32 +0000)
commitfbdd8b59dc7f7c12c967d89c1ac3a2273d566f24
tree715d547d2502de8d04de0ec12233b3183ce62c99
parenteef5d8de0834156c5d2583b222c624b353fc9ca5
parent0c152b9e8424bdcbf558391ad40d2ca4fea9f62a
am 0c152b9e: (-s ours) am 30c5da9c: Don\'t call cancel() when fingerprint auth fails

* commit '0c152b9e8424bdcbf558391ad40d2ca4fea9f62a':