Hugo Benichi b1894abbc5 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 ...

am: f6883504c2

Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7

2017-07-19 08:09:38 +00:00

..

connectivity

resolve merge conflicts of a1d67fb38e to stage-aosp-master

2017-07-18 23:37:57 +00: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