tree a525ec0a3899b6048a73b1f70bb5e29668326d08
parent ce980428e3b4c498376aa8bddaf112fd34ebfdf8
parent 442180cdae6a99817e98724901cb5f5263025e64
author Neil Fuller <nfuller@google.com> 1416823884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416823884 +0000

am 442180cd: Merge "Switch over to a new TLS fallback strategy"

* commit '442180cdae6a99817e98724901cb5f5263025e64':
  Switch over to a new TLS fallback strategy