| commit | 47c7b1a9818b8e40403f8a9b2a954e01b04d56c3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Mar 14 22:22:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 22:22:55 2014 +0000 |
| tree | e18843965121dd13eeaf0f2d804c608974141cd4 | |
| parent | 13862a4de475595f5c600fd44b6220dadcb57f99 [diff] | |
| parent | fe7509cb308dd4f981081ad118e248b19fa2d78e [diff] |
am fe7509cb: am f3d4a538: resolved conflicts for merge of 9c5e545b to klp-modular-dev * commit 'fe7509cb308dd4f981081ad118e248b19fa2d78e': Return SSL_TLSEXT_ERR_NOACK with no NPN/ALPN