Merge "wifi: WifiManager API change for supporting Passpoint Release 2"

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

Thu, 26 Jan 2017 19:51:36 +0000 (19:51 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 26 Jan 2017 19:51:37 +0000 (19:51 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Thu, 26 Jan 2017 19:51:36 +0000 (19:51 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 26 Jan 2017 19:51:37 +0000 (19:51 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Thu, 26 Jan 2017 19:51:36 +0000 (19:51 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 26 Jan 2017 19:51:37 +0000 (19:51 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history