OSDN Git Service

am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messa...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)
commit74125c85b169212dfd61565cbf8bd8ce1204c97c
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent06afac56602dee941c8badcbc1f7f1380b52afe5
parentb2e34d3637d6edd03bb7ce45a7f84a27bc101f9c
am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

* commit 'b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':