tree 6b9507b60471a78c53f78097b3746d32d18af722
parent afacdbe1e824845917d038a5848ae515d44393bb
parent 1785c097ccaf9732902c2245fc63c4d044565ffa
author Jorim Jaggi <jjaggi@google.com> 1439258024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439258024 +0000

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

* commit '1785c097ccaf9732902c2245fc63c4d044565ffa':
  Don't show fingerprint cancellation messages in keyguard