| commit | deb6a3acbdbf81a995cc3c1eb2475b041564d44d | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 13 01:09:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 01:09:21 2015 +0000 |
| tree | 7e99b0056b85682e7d05f57942566b93b56dc9e8 | |
| parent | 40bc20660d3dc65f66e4409893f1ba6bf729d97f [diff] | |
| parent | 73d9e1ce0bc8e4478b165fd5f550c99830fbcb57 [diff] |
am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev * commit '73d9e1ce0bc8e4478b165fd5f550c99830fbcb57': Require strong authentication after a timeout