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