diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2017-12-18 13:05:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-18 13:05:42 +0000 |
| commit | a47649076e7686b4fc3428915c5e202c6f1fc8a9 (patch) | |
| tree | f739cce72c544290b69063c071715881386c65e6 /annotations/generate_annotated_java_files.py | |
| parent | c2a74064b983615aba6f7fd853f3d0a72d9897d9 (diff) | |
| parent | 3c9702a31175d158fb8047aea95b2b37dea53513 (diff) | |
Merge "Merge "Merge "Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 -s ours" into nougat-cts-dev am: 54f94a32b6 -s ours" into nougat-mr1-cts-dev am: 6cf2df9fcb -s ours" into oreo-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions