Hugo Benichi b81fc1cf14 Merge changes I4719b4dc,I0308cdf4,I38db1bb7 ...

* changes:
  IpManagerTest: fix flaky test
  Fix flaky NsdManagerTest
  Boostrap test for NetworkMonitor

2017-09-14 11:59:58 +00:00

..

core/java/com/android/server

Merge changes I4719b4dc,I0308cdf4,I38db1bb7

2017-09-14 11:59:58 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00