| commit | 8e194d42bb9c7d518f060befddd415d63776bcb5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:16:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 12:16:18 2013 -0700 |
| tree | 2cf96a5d8cf34729b5531f1990204662eb468e93 | |
| parent | b8e456e3b6d9184d81760a9b68cd1103e610846a [diff] | |
| parent | f602b9dfc17462939b26fe995c355e844e765589 [diff] |
am f602b9df: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f602b9dfc17462939b26fe995c355e844e765589': Delay SSLSocketImpl instantiation until needed DO NOT MERGE