Hugo Benichi 0537f16516 Merge "ConnectivityManager: allow usage of TYPE_NONE" ...

am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

2017-07-05 14:33:35 +00:00

..

connectivity

resolve merge conflicts of b1eb85c9a8 to stage-aosp-master

2017-07-05 16:48:19 +09:00

net

Networking unit tests: fix some flaky tests

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

ConnectivityServiceTest.java

Merge "ConnectivityManager: allow usage of TYPE_NONE"

2017-07-05 14:33:35 +00:00

NsdServiceTest.java

Move NsdServiceTest to correct directory

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