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

Skip to content
Commit f4285f22 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

resolve merge conflicts of 823bd745 to lmp-mr1-dev am: 67ca3caf 

am: 6b52fd6b

* commit '6b52fd6b':
  MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I0e66a037649b0000c90c91b40af6eb587362c00b
parents e83713c1 6b52fd6b
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