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

Skip to content
Commit a88fe626 authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Merge tag 'android-5.1.0_r1' into AOSP_MERGE 

Android 5.1.0 release 1

Conflicts:
	CleanSpec.mk
	core/Makefile
	core/build_id.mk
	core/version_defaults.mk
	target/product/languages_full.mk

Change-Id: Ic9f4fb72f0d6f2703ec94bb0c2185d77f1156100
parents f432fe82 9ef2e964
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