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

Skip to content
Commit 5f44938f 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 am: f4285f22 

am: 87406db2

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

Change-Id: I6f37992a285efbc2fa08da3b0f6e6f0fecb52b07
parents c65002b0 87406db2
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