OSDN Git Service

Merge changes If4deb106,Ib25d7658
authorHugo Benichi <hugobenichi@google.com>
Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 26 May 2017 00:34:05 +0000 (00:34 +0000)
commit0388f0e47b9853437cdeebafc77d38e86606554b
tree64977dd5aa82375fa292aab2d92cc377e07f2f66
parent25ce41cf4c54eb2be721c7cdaede5d866181ffa0
parent03f6e1d18a495fb2fe691db7537e944aba1f13cc
Merge changes If4deb106,Ib25d7658

* changes:
  NsdService: do not use ContentResolver directly
  @Ignore ConnectivityServiceTest#testRequestBenchmark