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

Commit 21dddc2d authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

resolve merge conflicts of ce65d54d to nyc-dev-plus-aosp am: 123e1f3d 

am: 81f1d75f

* commit '81f1d75f':
  AVRCP: Use MediaController

Change-Id: I801cf073752ecc1c78cf6edd82c2f02eeb2fed1f
parents a90aa89e 81f1d75f
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