summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-21 10:44:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-21 10:44:22 +0000
commit1495651f7272d67357340cfb4f13e7f5234932f1 (patch)
tree0b716055a28200ffedce3b90ba977d743eb83137 /annotations/generate_annotated_java_files.py
parentabdcc0cf4507870240701f53351223d8307dae17 (diff)
parent1102cc78fa670c81eee7ec8298626754fa5212ae (diff)
Merge "Make ServerSocketChannelTest.test_bind_loopback more tolerant." am: b4c7678235 am: 1102cc78fa
Change-Id: I2e9efbbe7074f113e9d0de5a4cf8bfcb00d47041
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions