diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-11 22:51:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-11 22:51:16 -0700 |
| commit | 08acc2eb0e968f7b1fe5fec43662177ef3fcb4c8 (patch) | |
| tree | fc77276d9d384e60503eee091513561af0e00ed2 /annotations/generate_annotated_java_files.py | |
| parent | 434ab25155e0d108b05bfef30adbb84fa0ec7095 (diff) | |
| parent | 9cf7cd797ad34e403fed7091ac20f68361c58ae5 (diff) | |
[automerger skipped] Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e651d am: 4d9c5ba680
am: 9cf7cd797a -s ours
Change-Id: I8626632e57947fc54fc01553e2511eb9a91e539e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions