OSDN Git Service

Merge changes I4719b4dc,I0308cdf4,I38db1bb7
authorHugo Benichi <hugobenichi@google.com>
Thu, 14 Sep 2017 11:59:58 +0000 (11:59 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 14 Sep 2017 11:59:58 +0000 (11:59 +0000)
commita3c28cc567d9bf42050e5106120a9fef440c339f
tree33c82f5143caab7d7c2bb6bf3e4da2b02aa017c0
parent61901ddedd5393183069f3bcda6cfeb0ccbc2db2
parent25c7f49ff319ff60ce49665b5f3cf4f494b49717
Merge changes I4719b4dc,I0308cdf4,I38db1bb7

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