am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b to kl… · aosp-mirror/platform_external_openssl@cee5403 · GitHub

This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

am aad21bb: (-s ours) resolved conflicts for merge of 4068658 to klp-…

Browse files

…modular-dev

* commit 'aad21bb5750deae5bdff03023a5b0fce64596253':
  Add support for TLS_FALLBACK_SCSV

Loading branch information

nfuller authored and Android Git Automerger committed Oct 9, 2014

2 parents 9a68a8f + aad21bb commit cee5403