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