Commits
Jorim Jaggi authored and Android Git Automerger committed 74125c85b16M
am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev * commit 'b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':
Showing diff tob2e34d3637d