| commit | 078004add275cab9987bd3b5c4e4130b43df84ea | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Aug 13 14:51:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 14:51:53 2013 -0700 |
| tree | ba493c4f888a98a07af0fcbceb870484e4ad7ecd | |
| parent | 7662decc8f730fa91ea12001d75159a91f928fa0 [diff] | |
| parent | 8072914c740ad7f68a02e2b25f97bc42dcdb32a6 [diff] |
am 8072914c: (-s ours) am 954f78a8: Merge "Delay SSLSocketImpl instantiation until needed DO NOT MERGE" into jb-mr2-dev * commit '8072914c740ad7f68a02e2b25f97bc42dcdb32a6': Delay SSLSocketImpl instantiation until needed DO NOT MERGE