Merge changes from topic 'hide_passpoint_r2' into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Tue, 30 May 2017 18:47:06 +0000 (18:47 +0000)

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

Tue, 30 May 2017 18:47:12 +0000 (18:47 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 30 May 2017 18:47:06 +0000 (18:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 May 2017 18:47:12 +0000 (18:47 +0000)
diff --cc api/test-current.txt
Simple merge
diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 30 May 2017 18:47:06 +0000 (18:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 May 2017 18:47:12 +0000 (18:47 +0000)
		1	2
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiManager.java	patch \|	diff1 \|	diff2 \|	blob \| history