diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-08-14 12:11:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-14 12:11:58 -0700 |
| commit | 95c6f1ba7fb55d585e5d3373d1e5acfd30a8a5ed (patch) | |
| tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
| parent | 0f90c3b4d2e6c48a35443dd8bc01c8e6bb681804 (diff) | |
| parent | f6f431c2d81fffccb5171e5e5b227e841c1ceb7e (diff) | |
| download | apache-http-kitkat-dev.tar.gz | |
am f6f431c2: (-s ours) Reconcile with jb-mr2-release - do not mergeandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-dev
* commit 'f6f431c2d81fffccb5171e5e5b227e841c1ceb7e':
Do not initialize SSLSocketFactory too early DO NOT MERGE
0 files changed, 0 insertions, 0 deletions