OSDN Git Service

[automerger skipped] Merge "Enable the AVRCP Service by default (2/2)" am: 1a4403bdc8...
authorAjay Panicker <apanicke@google.com>
Fri, 25 May 2018 13:04:41 +0000 (06:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 13:04:41 +0000 (06:04 -0700)
am: c165558f50  -s ours

Change-Id: I6423af4276f923a48d7d446636d9f3e7bfd1e493


Trivial merge