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