diff options
author | Tobias Thierer <tobiast@google.com> | 2018-07-11 18:24:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-11 18:24:09 -0700 |
commit | 4d9c5ba68036dfe2b166bc150349a9a120e6c63f (patch) | |
tree | 649e1afa48480dded8c9ee8f195ef92b13d0ac50 /annotations/generate_annotated_java_files.py | |
parent | 321598b800ee294a99b2580539f210e6a68dab46 (diff) | |
parent | 54d41e651ddb9f6a7bde9123976bedc06775b1ec (diff) |
Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev
am: 54d41e651d
Change-Id: I0799248cae275fe1a32a1bd1640e71c1c83edc3d
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions