diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-12 00:29:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-12 00:29:20 -0700 |
| commit | 3c322d609760e596a37a630ea237da6d1e1836da (patch) | |
| tree | 1e33aeb3027935347f1cfa78d6317622fbd503ae /annotations/generate_annotated_java_files.py | |
| parent | 25f1aab417b492ab55ce4c2d9e7646f95766cffa (diff) | |
| parent | 08acc2eb0e968f7b1fe5fec43662177ef3fcb4c8 (diff) | |
[automerger skipped] Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e651d am: 4d9c5ba680 am: 9cf7cd797a -s ours
am: 08acc2eb0e -s ours
Change-Id: I2503a161f7c518d05ea0077554d78a5a03985373
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions