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

Skip to content
Commit 7aad7189 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

[automerger skipped] m4v_h263 no longer requires consumers to define OSCL_*... 

[automerger skipped] m4v_h263 no longer requires consumers to define OSCL_* macros am: f8fe08f0 am: 78f80e96 -s ours am: 243f5722 -s ours am: d854eb5a -s ours

am skip reason: Change-Id I02d51b8b535ed6b983a5b9f7d13b512b0c6c0fb0 with SHA-1 2b92f9f3 is in history

Change-Id: I67c553a72f4ab98e0d5bff7f5de3e0233a679d70
parents 7e5a7833 d854eb5a
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