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

Commit 81f1d75f 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

* commit '123e1f3d':
  AVRCP: Use MediaController

Change-Id: Ie9c1227cf82e53801b0255a890bafa4d2d8a01f6
parents 3fe5bcc9 123e1f3d
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