diff options
author | Tobias Thierer <tobiast@google.com> | 2019-07-09 11:51:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 11:51:40 -0700 |
commit | ffa68645849b711e1cfc391d829c8818196da1b9 (patch) | |
tree | 1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py | |
parent | fa5f484fcb66a24e09bc46efe3d6be915a03f6db (diff) | |
parent | b57c006c9fc4285a0a217ce443049fd4d610f6f4 (diff) |
Merge "Fix harmony URLConnectionTest hanging for 25sec." into pie-cts-dev am: 781e06ebf9 am: 77c5f9bc10
am: b57c006c9f
Change-Id: I5a682c22ccfd2747215cc28a30910de217f26346
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions