diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:29:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:29:38 +0000 |
| commit | 060de01690c0e7a1a41538960642b2d245c1219d (patch) | |
| tree | 0d7012ac7d3e5014a544171894e31967766482b5 /annotations/generate_annotated_java_files.py | |
| parent | 055d84750a159753e5e5a302d7c701845c4c9d3b (diff) | |
| parent | d4f1eeae5c61de328cef26ae2b3f2f904a402064 (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 am: 959235067e -s ours am: 7e5b36c85c -s ours am: 648b779e85 -s ours am: 7987794c59 -s ours am: 929e12afe9 -s ours am: cf80fdd066 -s ours am: 93da99364a -s ours
am: d4f1eeae5c -s ours
Change-Id: I10fb310d364da0b5a729af9b6eb3f23e69c8d6d6
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions