mainline lk.lnx.1.0 HEAD commit

commit 0b84df2f
Merge: 439bec66 1af05fdd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Aug 1 11:26:11 2018 -0700

Merge "target: msm8953: enable HX8399C HD+ panel for SDM632 CDP target"

lk.lnx.1.0.1 HEAD commit
commit dad31f6ac1a229cb78de3fdd988330705cd5c2ff
Merge: d63a3206 7bfbb0e9
Author: Firoz Khan <firozk@codeaurora.org>
Date:   Wed Aug 8 17:18:26 2018 +0530

Merge branch 'lk.lnx.1.0' into lk.lnx.1.0.1

Conflicts:
	AndroidBoot.mk
	app/aboot/aboot.c
	app/aboot/devinfo.h
	app/aboot/recovery.c
	dev/fbcon/fbcon.c
	platform/msm_shared/display.c
	platform/msm_shared/include/boot_stats.h
	platform/msm_shared/include/mdp4.h
	platform/msm_shared/smem.h
	target/init.c
	target/msm8996/init.c
	target/target_display.c

Change-Id: Ie1e5a54e7d60b48c281f338f69957e08470324e6
Signed-off-by: Firoz Khan <firozk@codeaurora.org>