diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 09:57:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 09:57:39 +0000 |
| commit | c9f5845a2a425e568812cb29d94652b5ee058394 (patch) | |
| tree | bb3cbe07ace1041dac4642e4524d85d3bb141b24 | |
| parent | cee54034353c4f03db9ee975a50be05c0496e1b2 (diff) | |
| parent | 75b7f959caa48362bbc4d6f3592e66d312380d1b (diff) | |
| download | openssl-lollipop-release.tar.gz | |
am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aospandroid-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-devlollipop-cts-release
* commit '75b7f959caa48362bbc4d6f3592e66d312380d1b':
Add support for TLS_FALLBACK_SCSV
0 files changed, 0 insertions, 0 deletions