| commit | dac977d1191eb1797d932d9fa45256a2958d1cb8 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 27 19:43:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 19:43:44 2015 +0000 |
| tree | f7bd5a566d3bbf79ebd49bb0be1f9d171deb588e | |
| parent | c9e785954c43a17e4396673f114c57bac2c28a0e [diff] | |
| parent | 74125c85b169212dfd61565cbf8bd8ce1204c97c [diff] |
am 74125c85: am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev * commit '74125c85b169212dfd61565cbf8bd8ce1204c97c':