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

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

Merge tag 'android-5.1.1_r23' into cm-12.1 

Android 5.1.1 release 23

Conflicts:
	include/media/stagefright/ACodec.h
	media/libstagefright/MPEG4Extractor.cpp
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/Utils.cpp
	media/libstagefright/codecs/amrwbenc/src/util.c

Change-Id: I89ea84e273f2ebb2046ef4eeab91d541e0b6d47e
parents 2cdeeb45 95130295
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