diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-07-24 11:05:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-24 11:05:07 -0700 |
| commit | 54164b52465aa559f9dda27acc5bfee3d98e47d2 (patch) | |
| tree | fc6d79fc75b95ebc54f0938c3c1c5d21581646e4 /annotations/generate_annotated_java_files.py | |
| parent | e71b65f47d67b85cd687c361e29a9cf37e47e2e1 (diff) | |
| parent | bebe134c3f9d0ab0ab7c769edd5788abe1fa7632 (diff) | |
am bebe134c: Merge "Fix flakey test_SSLSocket_setSoTimeout_basic by using a full second timeout"
* commit 'bebe134c3f9d0ab0ab7c769edd5788abe1fa7632':
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