tree 949e5746bf49103a1bfa87014fc61089f7b2905c
parent 590e90c606b3f45fcefe68d054cb5670854f431b
parent a72dc1fe6fa1ba681655efc474d11f7bbcfffc5d
author Marie Janssen <jamuraa@google.com> 1496360759 +0000
committer android-build-merger <android-build-merger@google.com> 1496360759 +0000

Merge "AVRCP: synchronize around mMediaController" into oc-dev am: 1ed348039a
am: a72dc1fe6f

Change-Id: I174bc0afc7758c68ca89b486b94014b0e8f4745f