tree bb3cbe07ace1041dac4642e4524d85d3bb141b24
parent cee54034353c4f03db9ee975a50be05c0496e1b2
parent 75b7f959caa48362bbc4d6f3592e66d312380d1b
author Neil Fuller <nfuller@google.com> 1412935059 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412935059 +0000

am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp

* commit '75b7f959caa48362bbc4d6f3592e66d312380d1b':
  Add support for TLS_FALLBACK_SCSV