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