diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-11 19:25:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-11 19:25:35 -0700 |
| commit | 5c664a69415b0a16f84557540d50de690cffe2be (patch) | |
| tree | f51f80c30214e5cf676d5b3c294ca5bfc398ed04 /annotations/generate_annotated_java_files.py | |
| parent | 7a5dc304fa542dac1b35f20976caba934d14bde8 (diff) | |
| parent | e7483acd9b0928a2506e786ec1df3fce2db87aad (diff) | |
[automerger skipped] Merge "Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e651d" into oreo-mr1-cts-dev
am: e7483acd9b -s ours
Change-Id: I23eee4d8e3cae21c237484ff6ed4c348ef4355fa
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions