Hugo Benichi f6883504c2 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" ...

am: 24a2adfa27

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321

2017-07-19 08:04:48 +00:00

..

connectivity

resolve merge conflicts of a1d67fb38e to stage-aosp-master

2017-07-19 07:35:31 +09:00

net

Networking unit tests: fix some flaky tests

2017-07-03 16:29:01 +09:00

ConnectivityServiceTest.java

Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"

2017-07-19 08:04:48 +00:00

NsdServiceTest.java

Move NsdServiceTest to correct directory

2017-05-24 14:18:48 +09:00