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

Commit e188177c authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

resolve merge conflicts of d579be0c to nyc-dev-plus-aosp 

am: 4c3d43d2

* commit '4c3d43d2':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: I8e0bfa7f23437ba3fe75283d6020b446ea82d55c
parents 45fea4d6 4c3d43d2
Show 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