diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-07-05 19:35:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-05 19:35:58 +0000 |
| commit | f9b580c4152205ddee250fd0d7bb3e37a248eb53 (patch) | |
| tree | 616d91a4d3b17efe31b1d9566e76caa13a6bf8f0 /annotations/generate_annotated_java_files.py | |
| parent | bbea315f534b92d98566afd18ef61ccd198bd5b1 (diff) | |
| parent | 62315edbfb6f4665c86423d9866b0e929349c169 (diff) | |
Merge "DO NOT MERGE: Stabilize testConcurrentServerSocketCloseReliablyThrows." into nougat-mr1-cts-dev am: 00a16ee49d -s ours am: 79ca4a55f5 am: 872100e72f
am: 62315edbfb -s ours
Change-Id: I84cbadbf2150f13c922f52f734d56a3663712ea1
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions