| commit | b0767c8c356e5afdc0751483d2c631f3ab97aeb4 | [log] [tgz] |
|---|---|---|
| author | Olawale Ogunwale <ogunwale@google.com> | Thu Dec 18 21:02:00 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 18 21:02:00 2014 +0000 |
| tree | 268b8d49e1b53c8cbb001512e6c44e89ad7ed7b4 | |
| parent | 496894b0e1d951160c14d2bc74243af972775a4f [diff] | |
| parent | a96b61d931df00ab5744c53a87008a9cce461329 [diff] |
am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." automerge: 5cb6837 automerge: a96b61d * commit 'a96b61d931df00ab5744c53a87008a9cce461329': Avoid deadlock between ActivityManagerService and ProcessStatsService.