Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_lge_mako into HEAD

Conflicts:
	WCNSS_qcom_cfg.ini
	camera/QCameraHWI.cpp
	cm.mk
	setup-makefiles.sh
	vendor_owner_info.txt

Change-Id: I6e3999042b03d9ce20e5e70f15aba3e38e92fbb0

Author: M1cha

WCNSS_qcom_cfg.ini

@@ -232,16 +232,17 @@ gNumChanCombinedConc=255
 
 # TDLS configuration
 gEnableTDLSSupport=1
-gEnableTDLSImplicitTrigger=0
-gTDLSTxStatsPeriod=5000
-gTDLSTxPacketThreshold=100
+gEnableTDLSImplicitTrigger=1
+gTDLSExternalControl=1
+gTDLSTxStatsPeriod=500
+gTDLSTxPacketThreshold=10
 gTDLSDiscoveryPeriod=20000
 gTDLSMaxDiscoveryAttempt=5
-gTDLSIdleTimeout=5000
+gTDLSIdleTimeout=40000
 gTDLSRssiHysteresis=100
-gTDLSRSSITriggerThreshold=-75
+gTDLSRSSITriggerThreshold=-60
 gTDLSIdlePacketThreshold=5
-gTDLSRSSITeardownThreshold=-75
+gTDLSRSSITeardownThreshold=-70
 
 END
 # Note: Configuration parser would not read anything past the END marker