tree 84156d269d1348e52ba2311a2bb70176de3905d7
parent 5910c61af4aba20e00c660a6a59116000565fe63
parent ec867ed03b50f23f2a2abd266814a9e41e6c76d8
author Marie Janssen <jamuraa@google.com> 1495661567 +0000
committer android-build-merger <android-build-merger@google.com> 1495661567 +0000

Merge "AVRCP: don't remove inactive media controllers" am: 65c71f4025 am: b2e17d6b13
am: ec867ed03b

Change-Id: Icdb07f043bf52286c74492623b44a1dbf441464d