Merge "Unhide WifiConfiguration proxy accessors"

author Glen Kuhne <kuh@google.com>

Tue, 17 Jan 2017 21:38:25 +0000 (21:38 +0000)

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

Tue, 17 Jan 2017 21:38:29 +0000 (21:38 +0000)
author Glen Kuhne <kuh@google.com>
Tue, 17 Jan 2017 21:38:25 +0000 (21:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2017 21:38:29 +0000 (21:38 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge
author	Glen Kuhne <kuh@google.com>
	Tue, 17 Jan 2017 21:38:25 +0000 (21:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 Jan 2017 21:38:29 +0000 (21:38 +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
wifi/java/android/net/wifi/WifiManager.java	patch \|	diff1 \|	diff2 \|	blob \| history