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

Skip to content
Commit c7b37250 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-5.1.1_r3' into HEAD 

Android 5.1.1 release 3

Conflicts:
	fs_mgr/Android.mk
	init/Android.mk

Change-Id: I3f88b938b9e50b47115713788dcce74e8bee3062
parents 5cccf81c 5b3aa21b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment