Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev

author Wei Wang <weiwa@google.com>

Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)

committer Android Partner Code Review <android-gerrit-partner@google.com>

Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)
author Wei Wang <weiwa@google.com>
Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)
committer Android Partner Code Review <android-gerrit-partner@google.com>
Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc wifi/java/android/net/wifi/WifiScanner.java
Simple merge
author	Wei Wang <weiwa@google.com>
	Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)
committer	Android Partner Code Review <android-gerrit-partner@google.com>
	Tue, 23 Feb 2016 05:09:38 +0000 (05:09 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiScanner.java	patch \|	diff1 \|	diff2 \|	blob \| history