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

Skip to content
Commit 2248e680 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am cc21582f: resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp 

* commit 'cc21582f':
  Correct makefile test for stagefright build
parents 1804025f cc21582f
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