| commit | 74125c85b169212dfd61565cbf8bd8ce1204c97c | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 27 10:15:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:15:14 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 06afac56602dee941c8badcbc1f7f1380b52afe5 [diff] | |
| parent | b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c [diff] |
am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev * commit 'b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':