OSDN Git Service

Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae75...
authorLucas Lin <lucaslin@google.com>
Wed, 23 Oct 2019 10:27:11 +0000 (03:27 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Oct 2019 10:27:11 +0000 (03:27 -0700)
commitcf596519cb4278477e5ec8f5d3a3ad3aa26b920f
tree10e22dd2bf3cbaeb2abcd5dbc5e7c535b82d2361
parent66bd88c9cd33bb212481e11d7bd2011eaeb90abe
parent06b7986eff45698dc74fae14b7d11f718bee971e
Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f am: 9b29332cd3
am: 06b7986eff

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