diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-08-14 12:34:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-14 12:34:03 -0700 |
| commit | b34d299c7d638edb9768bc7ca52f00e52d3575c1 (patch) | |
| tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
| parent | 82fdf7f4648fdad7125d461592c812c6e75ee58a (diff) | |
| parent | 95c6f1ba7fb55d585e5d3373d1e5acfd30a8a5ed (diff) | |
| download | android_external_apache-http-b34d299c7d638edb9768bc7ca52f00e52d3575c1.tar.gz android_external_apache-http-b34d299c7d638edb9768bc7ca52f00e52d3575c1.tar.bz2 android_external_apache-http-b34d299c7d638edb9768bc7ca52f00e52d3575c1.zip | |
am 95c6f1ba: (-s ours) am f6f431c2: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '95c6f1ba7fb55d585e5d3373d1e5acfd30a8a5ed':
Do not initialize SSLSocketFactory too early DO NOT MERGE
0 files changed, 0 insertions, 0 deletions