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

Skip to content
Commit cdabfe48 authored by Andreas Huber's avatar Andreas Huber
Browse files

resolved conflicts for merge of e55951df to master 

Conflicts:
	media/libstagefright/wifi-display/Android.mk

Change-Id: Icdf5e745a859506cbed7be93b6bc5def8046473c
parents 4e6139a5 e55951df
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