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

Commit d748cf6f 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 

am: e188177c

* commit 'e188177c':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Id7017b8cc3352cf2ee5f3f6c8590cda97c373a99
parents 98901e8a e188177c
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