tree 5740e9666270ee31cd0ba320240849a225facae5
parent eba092bdb9ea5b713f2ecce513805fe9a799108a
parent 174be8ea3048e8a960ffef390c7ad75885210ff5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582165855 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582165855 +0000

Merge changes from topic "bt-avrcp-controller-cover-art" am: 773a98c249 am: 174be8ea30

Change-Id: Id8114fb2c3a275f406d2de3555f9836453d73f23