Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8

author Ningyuan Wang <nywang@google.com>

Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)

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

Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
author Ningyuan Wang <nywang@google.com>
Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc wifi/java/android/net/wifi/WifiInfo.java
Simple merge
author	Ningyuan Wang <nywang@google.com>
	Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiInfo.java	patch \|	diff1 \|	diff2 \|	blob \| history