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

Commit dd91699f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'jb-mr0-release' of... 

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

Conflicts:
	rootdir/init.rc

Change-Id: I438743e976c6709088458f1a8dbec4fb974dd8fa
parents f7ac9ae1 ca38f2c7
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