diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-07-24 10:50:52 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-24 10:50:52 -0700 |
| commit | bebe134c3f9d0ab0ab7c769edd5788abe1fa7632 (patch) | |
| tree | 5e186125cab9e7a14366760131c8111f04823a7a /annotations/generate_annotated_java_files.py | |
| parent | 80cfc0dfe417f58499fadf1dee99e5cfc69f4286 (diff) | |
| parent | fc1332710b0af3bbe658535a257048cf8c7577f2 (diff) | |
Merge "Fix flakey test_SSLSocket_setSoTimeout_basic by using a full second timeout"
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions