From: Marie Janssen <jamuraa@google.com>
Date: Wed, 4 May 2016 23:54:00 +0000 (+0000)
Subject: Merge "AVRCP: Provide more media attributes" am: 124563d21a am: f9e644effb am: 1e56607e23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=26f1aa589186feb28ae9b846aab15c27a9153c60;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "AVRCP: Provide more media attributes" am: 124563d21a am: f9e644effb am: 1e56607e23
am: 5d5a280697

* commit '5d5a2806979a7216b25f40af820681f8f6fd5b34':
  AVRCP: Provide more media attributes

Change-Id: I50f080b5d328d52701676b709163b52f50e7ca7f
---

26f1aa589186feb28ae9b846aab15c27a9153c60