| commit | 26a0b16da8026898bd0b90365ccf3a0eadae01fb | [log] [tgz] |
|---|---|---|
| author | Shibin George <shibing@codeaurora.org> | Thu Jul 07 15:36:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 07 15:36:46 2016 +0000 |
| tree | 4006e1b95a6534b2460a3906c579bef0e000dcf6 | |
| parent | eea1ae16d545bf8c0cb696811001168b320a9514 [diff] | |
| parent | 2c565826bac683a59cdcf4694077d75e5adf0670 [diff] |
Merge \\"Resolve deadlock between ActivityManagerService and PowerManagerService\\" am: 06561db207 am: 2c565826ba Change-Id: I875f9f1ed5f6ab82c85ab35e7a24737d08aa3365