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