tree 77c8d48860c8a4d039941f74544b54ac47d5d412
parent b2b020922fb51b88d34a6478209fc232702de318
parent b29814c4ccdec4c1fbaaa3a6d633b104bee06184
author Jorim Jaggi <jjaggi@google.com> 1439256716 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439256716 +0000

Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev