tree f1cc61ea9c97591867982b9d4121113b737db567
parent b44cdfdd10ffa861492d044a058cfbaa167d71db
parent 231bddea314003579718f4214bd0bc535c289b05
author Jorim Jaggi <jjaggi@google.com> 1439258304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439258304 +0000

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

* commit '231bddea314003579718f4214bd0bc535c289b05':
  Don't show fingerprint cancellation messages in keyguard