Merge "Show "Disconnect" on forget button for ephemeral network"

author Cosmo Hsieh <cosmohsieh@google.com>

Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)
author Cosmo Hsieh <cosmohsieh@google.com>
Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
Simple merge
author	Cosmo Hsieh <cosmohsieh@google.com>
	Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Mar 2019 03:18:00 +0000 (03:18 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history