Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82583bfe authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'jb-release' of https://android.googlesource.com/platform/system/core into aosp 

Conflicts:
	rootdir/init.rc

Change-Id: I62663d9afbce06c44d2ace254e73ee1594632967
parents f773f058 b8d3d0e9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment