diff options
| author | Kenny Root <kroot@google.com> | 2013-08-13 11:44:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-13 11:44:06 -0700 |
| commit | 8072914c740ad7f68a02e2b25f97bc42dcdb32a6 (patch) | |
| tree | e93f40e94687c1f4838c940f56d5de7d390515d6 /annotations/generate_annotated_java_files.py | |
| parent | 9bd449c8b788bd7e819f3a3c946a4c6127ea30e1 (diff) | |
| parent | 954f78a851c6f1ca71c13e5c98ce1aa97c43449c (diff) | |
am 954f78a8: Merge "Delay SSLSocketImpl instantiation until needed DO NOT MERGE" into jb-mr2-dev
* commit '954f78a851c6f1ca71c13e5c98ce1aa97c43449c':
Delay SSLSocketImpl instantiation until needed DO NOT MERGE
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions