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

Skip to content
Commit 1f725570 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 am: 266eacc6  -s ours am: 886e9118 am: a1395f6b
am: bd78a52a

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

Change-Id: I993438d53f335c20e193b60930ad71c0722be006
parents 765290b1 bd78a52a
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