diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:21:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:21:47 +0000 |
| commit | cf80fdd066b8b2e7b3e8e339bd6669fd80c7daf0 (patch) | |
| tree | 6f57052d1923e2400deea2690e28b578ed1c835a /annotations/generate_annotated_java_files.py | |
| parent | b2113c1d49f61ad99f8ac76ad43dc4db4b3bf07e (diff) | |
| parent | 929e12afe95d26467eb9d8a87956a7b26b243dbc (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
Change-Id: I102f14548ab81c794904a46f57d80be98364576e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions