OSDN Git Service

Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService...
authorShibin George <shibing@codeaurora.org>
Thu, 7 Jul 2016 15:41:48 +0000 (15:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 15:41:48 +0000 (15:41 +0000)
commit43e8af64c26677207260009850c11e6b2a9138ac
tree750db10def0a3a2c8a8fe1af03fe3f4e6de4568f
parent99b36c8b4f94bc9d69b0961c4e9fba330528d57e
parent26a0b16da8026898bd0b90365ccf3a0eadae01fb
Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\" am: 06561db207 am: 2c565826ba
am: 26a0b16da8

Change-Id: Ib90892556fde2bf8c53a7074b5d2702059adff65