| commit | cee54034353c4f03db9ee975a50be05c0496e1b2 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Oct 09 16:17:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 16:17:03 2014 +0000 |
| tree | bb3cbe07ace1041dac4642e4524d85d3bb141b24 | |
| parent | 9a68a8fb86e7440763286e3ea8578099abd598e7 [diff] | |
| parent | aad21bb5750deae5bdff03023a5b0fce64596253 [diff] |
am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b to klp-modular-dev * commit 'aad21bb5750deae5bdff03023a5b0fce64596253': Add support for TLS_FALLBACK_SCSV