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

Skip to content
Commit 19fff421 authored by Anh Nguyen's avatar Anh Nguyen
Browse files

Merge tag 'android-5.1.0_r1' into HEAD 

Android 5.1.0 release 1

Conflicts:
	cmds/atrace/atrace.cpp
	include/media/openmax/OMX_Audio.h
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/Layer.h
	services/surfaceflinger/SurfaceFlinger.cpp
	services/surfaceflinger/SurfaceFlinger.h

Change-Id: I090bc3c6d46cb853289b449b2e5f234ff950437d
parents bdeb67fd 796aaf7f
Hide 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