OSDN Git Service

Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee...
authorNarayan Kamath <narayan@google.com>
Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)
commit5191225400efa3c322ccb9273289fc745a4c7507
treef60633b7ed42f63f0bbc3e8de357adb43b0882ad
parentc11e8fcc04a543e04063a722813512a48387d7f7
parent4d7740907e961e254373d6d396c33e255f2b349f
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
am: 4d7740907e

Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/BroadcastQueue.java