| commit | 73041ff9f871029aa0fa2aae75f3567c6ff96942 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 10 09:46:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 09:46:39 2014 +0000 |
| tree | 587d1ced69398e4bf564b8f484a5a9715a978444 | |
| parent | 8b188b864302f5ea9df17636b378938a15b4605a [diff] | |
| parent | bb3214f878cf048dc21b768dac7b0a02ab063033 [diff] |
am bb3214f8: am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp * commit 'bb3214f878cf048dc21b768dac7b0a02ab063033': Add support for TLS_FALLBACK_SCSV