tree 6cb74658c20ad5e44dea0ae5dcb86bf47a743e79
parent 2ee7d5fddfd437f35159ebe0db2127913a3a85a7
parent f93e1931b360da17cae8a9fa86a2b287b12df1d8
author Jiyong Park <jiyong@google.com> 1533202684 +0900
committer Jiyong Park <jiyong@google.com> 1533202684 +0900

Merge QPR1.180718.001

Conflicts:
	init/ueventd.cpp
	libion/ion.c
	lmkd/lmkd.c
	rootdir/init.rc

Change-Id: I05419927e27be1148cd1a2665d51f9a715ab8d47