tree 8ad2449ee581d15a30db66a19fa8bb8f6a20af55
parent 72017834153711733905dfcf4bfe7b802062692b
parent 371c83ffde6c3836430843b99c2d34e17e25db7a
author Kenny Root <kroot@google.com> 1376431145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376431145 -0700

am 371c83ff: (-s ours) am 5751d48a: (-s ours) Do not initialize SSLSocketFactory too early DO NOT MERGE

* commit '371c83ffde6c3836430843b99c2d34e17e25db7a':
  Do not initialize SSLSocketFactory too early DO NOT MERGE