| commit | f5144a90b35e49c8611eeb7b62b5170922e0bec9 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 10 17:00:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 17:00:12 2014 +0000 |
| tree | 441ca9a473b409bfe1c89324c0c08129160b0542 | |
| parent | f95e3ce177b60bc9af35ba0ef40ae6fe385b86b0 [diff] | |
| parent | cee54034353c4f03db9ee975a50be05c0496e1b2 [diff] |
am cee54034: am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b to klp-modular-dev * commit 'cee54034353c4f03db9ee975a50be05c0496e1b2': Add support for TLS_FALLBACK_SCSV