tree 1e7a832737d93a7f26173d701e43ef1970449b0e
parent 564d8d32cbef09a569844f9bf16d1433b5540f5e
parent 1335ab5caed5388ffe32abb4a7fe7ed328e5fb84
author davidben <davidben@webrtc.org> 1493061493 +0000
committer android-build-merger <android-build-merger@google.com> 1493061493 +0000

Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c
am: 1335ab5cae

Change-Id: I9ef346f9718c83ce8bc715e12d4a69fa2cd2dfed