| commit | 95c6f1ba7fb55d585e5d3373d1e5acfd30a8a5ed | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:11:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 12:11:58 2013 -0700 |
| tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
| parent | 0f90c3b4d2e6c48a35443dd8bc01c8e6bb681804 [diff] | |
| parent | f6f431c2d81fffccb5171e5e5b227e841c1ceb7e [diff] |
am f6f431c2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f6f431c2d81fffccb5171e5e5b227e841c1ceb7e': Do not initialize SSLSocketFactory too early DO NOT MERGE