| commit | 69143070e62b61abf018c5454240abe2a95e4485 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Mon Dec 18 13:08:20 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Dec 18 13:08:20 2017 +0000 |
| tree | d0ee87a886fcd9b955faa4dec86ed2407289f3ea | |
| parent | f3b3e028f82d001685f0f2222e8f6b7094756e76 [diff] | |
| parent | 00701e48d716e5b56e476b0b810d05ea70995332 [diff] |
Merge "Merge "Merge "Merge "Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 -s ours" into nougat-cts-dev am: 54f94a32b6 -s ours" into nougat-mr1-cts-dev am: 6cf2df9fcb -s ours" into oreo-cts-dev am: a47649076e -s ours"