| commit | 2c565826bac683a59cdcf4694077d75e5adf0670 | [log] [tgz] |
|---|---|---|
| author | Shibin George <shibing@codeaurora.org> | Thu Jul 07 15:31:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 07 15:31:16 2016 +0000 |
| tree | e2392150fe091ddd405bd2a37e360fa68ebdb177 | |
| parent | b417585b2973433eb8878f0fa323c6b1ec29d910 [diff] | |
| parent | 06561db2078241dccd473e85c7015536f365c329 [diff] |
Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\" am: 06561db207 Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4