| commit | 43e8af64c26677207260009850c11e6b2a9138ac | [log] [tgz] |
|---|---|---|
| author | Shibin George <shibing@codeaurora.org> | Thu Jul 07 15:41:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 07 15:41:48 2016 +0000 |
| tree | 750db10def0a3a2c8a8fe1af03fe3f4e6de4568f | |
| parent | 99b36c8b4f94bc9d69b0961c4e9fba330528d57e [diff] | |
| parent | 26a0b16da8026898bd0b90365ccf3a0eadae01fb [diff] |
Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\" am: 06561db207 am: 2c565826ba am: 26a0b16da8 Change-Id: Ib90892556fde2bf8c53a7074b5d2702059adff65