OSDN Git Service

Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am: 1b62d99433
authorErik Kline <ek@google.com>
Mon, 11 Sep 2017 05:04:28 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 05:04:28 +0000 (05:04 +0000)
commitc8e912e5c4b7201327596e60072e0e23a5826f9d
treea18c538d40dac11320739f26672dadb8eef718c1
parent14e4964be0fba993f759cdc9b9521e2dbc2987c8
parent775807f4223751621722a3435f9e1f783ab55a2b
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am: 1b62d99433
am: 775807f422

Change-Id: I55fbd611fee9f17215412a76b480cdee96f62b32
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java