tree 7e3d6692c2c7421ecd1aab44af5062bfdf0f4d5d
parent 09e77852d8c25854894358789807a73c3e79ddf0
parent 3767d85caac8eec6c7c219de3d0a000fca18ad8b
author Jorim Jaggi <jjaggi@google.com> 1439257532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439257532 +0000

am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

* commit '3767d85caac8eec6c7c219de3d0a000fca18ad8b':
  Don't show fingerprint cancellation messages in keyguard