diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-11 21:33:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-11 21:33:45 -0700 |
| commit | 9cf7cd797ad34e403fed7091ac20f68361c58ae5 (patch) | |
| tree | e5342ea24100199db00e4ab099270784bcafc631 /annotations/generate_annotated_java_files.py | |
| parent | 19aa1f8cb3c49519ad0776d52e1f00a76a2543ee (diff) | |
| parent | 4d9c5ba68036dfe2b166bc150349a9a120e6c63f (diff) | |
Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e651d
am: 4d9c5ba680
Change-Id: Ic3ae66b8c620b797e53cd62b6f969c6b8ef0174e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions