OSDN Git Service

Merge \\\\"Resolve deadlock between ActivityManagerService and PowerManagerService...
authorShibin George <shibing@codeaurora.org>
Thu, 7 Jul 2016 15:47:33 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 15:47:33 +0000 (15:47 +0000)
commit084c4d73e7099b3d0c5d9ba73d6d68f85da23ed8
treef48e6bdbc6d30751716977e07ff817c5b955d022
parent219d9ba4fae554974fc0d2370f8b4556878307a3
parent43e8af64c26677207260009850c11e6b2a9138ac
Merge \\\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\\" am: 06561db207 am: 2c565826ba am: 26a0b16da8
am: 43e8af64c2

Change-Id: I9c261e2c4223069f8cfa8d16a5e96babc4522af0
services/core/java/com/android/server/power/PowerManagerService.java