tree 8ad2449ee581d15a30db66a19fa8bb8f6a20af55
parent 0f90c3b4d2e6c48a35443dd8bc01c8e6bb681804
parent f6f431c2d81fffccb5171e5e5b227e841c1ceb7e
author The Android Open Source Project <initial-contribution@android.com> 1376507518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376507518 -0700

am f6f431c2: (-s ours) Reconcile with jb-mr2-release - do not merge

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