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

Skip to content
Commit 266eacc6 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:... 

resolve merge conflicts of 823bd745 to lmp-mr1-dev am: 67ca3caf am: 6b52fd6b am: f4285f22 am: 87406db2 am: 5f44938f
am: ff8818df

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

Change-Id: Ib96a7f164ba4846f33737f3388ea0c242af38636
parents 02d1d044 ff8818df
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