| commit | 80581f7a65e3e365f2fa311196ff080c9308b733 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 13 01:18:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 01:18:18 2015 +0000 |
| tree | 5f3a1feae0a8e9a11ece8bf9624f4da4cfbe17ee | |
| parent | 1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f [diff] | |
| parent | deb6a3acbdbf81a995cc3c1eb2475b041564d44d [diff] |
am deb6a3ac: am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev * commit 'deb6a3acbdbf81a995cc3c1eb2475b041564d44d': Require strong authentication after a timeout