| commit | d7ad9bbce2563a59b8c19ee6b7d89d40f618b0d2 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Mon Dec 18 13:16:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 18 13:16:47 2017 +0000 |
| tree | 2c1f69bf7d29837879fa1c47ed2727de2412333f | |
| parent | 93d397fa3d8e13a9151718bdf6f5caa5593ef2c3 [diff] | |
| parent | b2113c1d49f61ad99f8ac76ad43dc4db4b3bf07e [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 Change-Id: I3812351eda42eae64823ba5dd7315d96dfeb11c4