tree 2f7739accb12b8e970c13f426420d7603995f88c
parent d3b646dc582841f1de44ffcb7b12297f837960b8
parent e152712c5fd4fc7d71bb61a0148071872a64a2ff
author Jack He <siyuanh@google.com> 1509573047 +0000
committer android-build-merger <android-build-merger@google.com> 1509573047 +0000

Merge "Support MediaBrowserService in AOSP Music" am: 25e17f5eb0 am: fa4067f55d
am: e152712c5f

Change-Id: I9b184b4fc5b2bc33f51cdaf810a305aaf9c89b33