diff options
| author | Victor Chang <vichang@google.com> | 2017-09-06 09:59:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 09:59:04 +0000 |
| commit | 42cbacbb97f600b4e4271f4f18ff2c73ee62d689 (patch) | |
| tree | 60ee97affbec735bd5dc9acb2be3338d3d50aa67 /annotations/generate_annotated_java_files.py | |
| parent | 7e5fed009803c0b1db84ae8c7a113b84b80fa438 (diff) | |
| parent | 40c8320b5f77587902c634ac09e6607d0a7acad9 (diff) | |
Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev
am: 40c8320b5f -s ours
Change-Id: I965d8532db6882060fb1ae835db1048b05f87420
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions