Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev

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

Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)

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

Thu, 27 Apr 2017 23:38:28 +0000 (23:38 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 27 Apr 2017 23:38:28 +0000 (23:38 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc wifi/java/android/net/wifi/IWifiManager.aidl
Simple merge
diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 27 Apr 2017 23:38:28 +0000 (23:38 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/IWifiManager.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiManager.java	patch \|	diff1 \|	diff2 \|	blob \| history