diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:00:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:00:15 +0000 |
| commit | 7c8141cd912a8530f01811f4ebc0468aba40d83b (patch) | |
| tree | 3f3dd90787a97a71dec3524d4402d36e16ad42ed /annotations/generate_annotated_java_files.py | |
| parent | c2fc4acfdf073ec9aa77ed05997a85222afb9f1f (diff) | |
| parent | c1db58bc943a2b3e2a1273f4c887cda16df0ce7e (diff) | |
Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev
am: c1db58bc94 -s ours
Change-Id: I6321ad4bd273771d0ac324681a9a8f69cab3e65a
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions