Commit b489cce8 authored by Richard JK's avatar Richard JK
Browse files

mainline lk.lnx.1.0 HEAD Commit


commit 62a7be71
Merge: 91f6505b cd5161b8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Nov 23 03:10:04 2018 -0800

    Merge "project: msm8909: Update the ramdisk and tags load address"

lk.lnx.1.0.1 HEAD Commit
commit 53aab48a
Merge: 566ac418 ceb6ece3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 8 06:06:33 2019 -0800

    Merge "target: msm8996: add intermediate splash status to kernel"

Conflicts:
	AndroidBoot.mk
	app/aboot/aboot.c
	app/aboot/bootimg.h
	platform/msm_shared/include/dev_tree.h

Change-Id: I7cce016759a31f4c618854c5f798e7fadc00304b
Signed-off-by: default avatarRichard JK <rjk@codeaurora.org>
parents 53aab48a 62a7be71
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment