diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:19:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:19:10 +0000 |
| commit | 929e12afe95d26467eb9d8a87956a7b26b243dbc (patch) | |
| tree | 557f5784cc58da46412ca9348caa19f84cd78400 /annotations/generate_annotated_java_files.py | |
| parent | 7b31b8783b101a8bd70ee49c6b528bc87250ccff (diff) | |
| parent | 7987794c59ad27d5a403f15a026e8c8a68b79d31 (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
Change-Id: I5dd3e5ccc5801a2c8c2ba315bbc3564b49f55cf9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions