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

Commit 9f115228 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp 

Merge commit '09f67250'

* commit '09f67250':
  Fix compilation errors in libmedia, libstagefright.
parents 26095af2 09f67250
Show 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