| commit | 055d84750a159753e5e5a302d7c701845c4c9d3b | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Mon Dec 18 13:21:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 18 13:21:52 2017 +0000 |
| tree | 0d7012ac7d3e5014a544171894e31967766482b5 | |
| parent | 3bcd54a6f3476fd084899bd476746b16cf1e891e [diff] | |
| parent | ac4a26a7d7b1d4a365c99f3b1d2d65eecdc3e6ab [diff] |
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 am: c7b5f34575 -s ours am: 8add0d42a2 -s ours am: 20b648a079 -s ours am: 7b31b8783b -s ours am: b2113c1d49 -s ours am: d7ad9bbce2 -s ours am: ac4a26a7d7 -s ours Change-Id: I20d7573a5a62968ca3aaace95d6cf8ce5bf4fdef