Merge changes I23540440,I67269e1a into oc-dev am: 4249a7092b

author Lorenzo Colitti <lorenzo@google.com>

Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)
diff --cc src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)
		1	2
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history