OSDN Git Service

Merge changes I86257bc8,I5c2221c5 into nyc-dev
authorLorenzo Colitti <lorenzo@google.com>
Mon, 2 May 2016 12:49:17 +0000 (12:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 May 2016 12:49:19 +0000 (12:49 +0000)
commit4a992cbde834fdf3770e34b21361b47f4786f65f
tree937d77f77fae07477cea3d207b23e259de35c2d4
parente0e6cf8e877d9b748c5f2b10e5bccdc037e5afa7
parentbd8759bdd102c1991f899bff4a4dd093345c6b52
Merge changes I86257bc8,I5c2221c5 into nyc-dev

* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
core/java/android/provider/Settings.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkManagementService.java