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

Skip to content
Commit 389b6f3b authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

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

Change-Id: I215fddc4f0af1fbda9ad5a2171de5f98321e7690
parents 361b8e14 7425b205
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