OSDN Git Service

Merge \\\\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\\\" am...
authorShibin George <shibing@codeaurora.org>
Thu, 23 Jun 2016 00:34:52 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 00:34:52 +0000 (00:34 +0000)
am: ccb59c489a

Change-Id: I88960a574fb0a5b2a2db5e0cb3e8d4eb836463cd


Trivial merge