Merge android-4.4-p.205 (5169787) into msm-4.4

author Srinivasarao P <spathi@codeaurora.org>

Mon, 2 Dec 2019 05:29:38 +0000 (10:59 +0530)

committer Srinivasarao P <spathi@codeaurora.org>

Mon, 2 Dec 2019 05:30:55 +0000 (11:00 +0530)
author Srinivasarao P <spathi@codeaurora.org>
Mon, 2 Dec 2019 05:29:38 +0000 (10:59 +0530)
committer Srinivasarao P <spathi@codeaurora.org>
Mon, 2 Dec 2019 05:30:55 +0000 (11:00 +0530)
diff --cc Makefile
Simple merge
diff --cc net/core/sock.c
Simple merge
author	Srinivasarao P <spathi@codeaurora.org>
	Mon, 2 Dec 2019 05:29:38 +0000 (10:59 +0530)
committer	Srinivasarao P <spathi@codeaurora.org>
	Mon, 2 Dec 2019 05:30:55 +0000 (11:00 +0530)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	patch \|	diff1 \|	diff2 \|	blob \| history