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

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

Merge tag 'android-6.0.0_r26' into HEAD 

Android 6.0.0 release 26

Conflicts:
	core/Makefile
	core/build_id.mk
	tools/releasetools/ota_from_target_files.py

Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
parents 5cd236c2 358c8909
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