commit 7f244f40f567afd116503668b6ca3ef0f9e8ff97
author Lalit Kansara <lkansara@codeaurora.org> Tue Dec 06 14:43:39 2016 +0530
committer Lalit Kansara <lkansara@codeaurora.org> Tue Dec 06 14:43:39 2016 +0530
tree 52f721ee63927915da94aeac7a5106ac45b27d13
parent 1d717314f5f1e8babcab7b4bf31a71d5e65fc452
parent 4da98e32a7c53663b1af4d979b27df214a3d3b46

Merge commit '4da98e32a7c53663b1af4d979b27df214a3d3b46' into remote

Conflicts:
	service/java/com/android/server/wifi/SoftApManager.java
	service/java/com/android/server/wifi/WifiConnectivityManager.java
	service/java/com/android/server/wifi/WifiController.java
	service/java/com/android/server/wifi/WifiCountryCode.java
	service/java/com/android/server/wifi/WifiMetrics.java
	service/java/com/android/server/wifi/WifiServiceImpl.java
	service/java/com/android/server/wifi/WifiStateMachine.java
	service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java

Change-Id: I147828805fe97cf04d9d84650649edf2b28c15fa