| commit | 286876e0d402df368b0ff67668d7d2dcaa2acc5f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Oct 31 18:41:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 18:41:09 2014 +0000 |
| tree | 9db8147a90ec0349a3e491cc7e54292aa3dbbf11 | |
| parent | b24c371c194bb2fbc62dfb0baec29740ebb06c23 [diff] | |
| parent | 45b7635dfb4a9ac311937c63451ef2344556e9f5 [diff] |
am 45b7635d: am ed6913e2: Merge "Fix ECDHE-PSK premaster secret derivation." * commit '45b7635dfb4a9ac311937c63451ef2344556e9f5': Fix ECDHE-PSK premaster secret derivation.