tree d5b0e24901070f7b9975ed57c7868f2637262b7e
parent 1fa3b11dfe50ded84d3cebe933f067d278f77a8e
parent 0e7a307e1440aa6edde687e44e21d3b9f968e325
author Jaewan Kim <jaewan@google.com> 1527190769 -0700
committer android-build-merger <android-build-merger@google.com> 1527190769 -0700

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

Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf