diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:08:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:08:51 +0000 |
| commit | 959235067ec41a047782c2721363a35b924fb331 (patch) | |
| tree | f45271857afe55e577146354a8f5885a6a73dc1f /annotations/generate_annotated_java_files.py | |
| parent | 48af8a945e02c55f58f27d105d59623c0cbfac59 (diff) | |
| parent | 7d90697304fa265c78ed213ebb9c56f0387cbf38 (diff) | |
Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 am: 236c07dfbd am: b9ea2fd3cc
am: 7d90697304
Change-Id: Ibf2c146f1c443676258bb649f6410af449a5e727
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions