diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:14:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:14:02 +0000 |
| commit | 648b779e85a0f9eba9b360402bf84db5dae4853a (patch) | |
| tree | 9f7402c499f5326b8c2c8904206a74a6f62b3e84 /annotations/generate_annotated_java_files.py | |
| parent | 8add0d42a211a304ea3b5ec4c1518bf074011077 (diff) | |
| parent | 7e5b36c85cae319003cd23d40e427f6ceb759d4c (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
Change-Id: Idf995b964620747945a924574a82ba14ea5110f8
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions