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

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

Merge tag 'android-6.0.0_r5' into HEAD 

Android 6.0.0 release 5

Conflicts:
	media/libstagefright/OggExtractor.cpp
	media/libstagefright/Utils.cpp

Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
parents bdf2ad57 02103bb2
Expand all 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