diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-07-05 19:24:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-05 19:24:57 +0000 |
| commit | 79ca4a55f584f7ce812b71a97270739ab9662cc7 (patch) | |
| tree | dc099d01baa14758be94f9afa8a0e42b8be4e6d8 /annotations/generate_annotated_java_files.py | |
| parent | a70d4b821f8c7f7838bff5915a3c4546a207dee2 (diff) | |
| parent | 00a16ee49d51165001c5cc2926af4761733d53ed (diff) | |
Merge "DO NOT MERGE: Stabilize testConcurrentServerSocketCloseReliablyThrows." into nougat-mr1-cts-dev
am: 00a16ee49d -s ours
Change-Id: I29a4b788bf41e33afad66356fa64bf2b706e392c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions