| commit | 95179ad4be0377dd9fd35818145f705bcded0d28 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 19:57:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 19:57:58 2015 +0000 |
| tree | f41b5f648f923316e9c3fea1f3414911d234c52a | |
| parent | 4eb81345da21efc2b9731cb1969704081064690c [diff] | |
| parent | 54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481 [diff] |
am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev * commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481': Poke fingerprint timeout when vold password is correct