tree 5c687f6c7253b3a09ebdfd46409044f010d31370
parent 8695c90def1c76f70e33833c7d1760f3aa8fa23d
parent 0349869c064d3d0a83359b49f3ce9c35a0fa837a
author Jaewan Kim <jaewan@google.com> 1527207974 -0700
committer android-build-merger <android-build-merger@google.com> 1527207974 -0700

Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev am: 0e7a307e14
am: 0349869c06

Change-Id: I1ae64f0ac0192afd4e6fc777a1ed4b2b7dd579a3