| commit | 123fb19dd1be29575dc2c9e3c7cf852f0da2607a | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 20:07:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 20:07:25 2015 +0000 |
| tree | 49e8ccfe95a733b3c53f55d86b3c6026f7b71e27 | |
| parent | 4008702700b9e14c756d453deb3bdfaff9138e92 [diff] | |
| parent | 95179ad4be0377dd9fd35818145f705bcded0d28 [diff] |
am 95179ad4: am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev * commit '95179ad4be0377dd9fd35818145f705bcded0d28': Poke fingerprint timeout when vold password is correct