OSDN Git Service

Merge changes If94102c7,I8d51e8e0
authorLorenzo Colitti <lorenzo@google.com>
Tue, 28 Mar 2017 12:22:42 +0000 (12:22 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 28 Mar 2017 12:22:43 +0000 (12:22 +0000)
commit22b829c049042cf2fbad0935d6bde322a0229236
treebb616b8b5b9e1e5779bfbe8f5fbd2a5c4f401e76
parent37778743200c3c023c0a4bf69105f4bc213d42fa
parent42cdf577037770a66d27f831d0f9e26532c3628d
Merge changes If94102c7,I8d51e8e0

* changes:
  Make ConnectivityServiceTest pass on wifi-only devices.
  Restore the net.dnsX system properties.