commit | 5cb6837f288e3f1e0ff8f6f9b571a85ebb34bca7 | [log] [tgz] |
---|---|---|
author | Olawale Ogunwale <ogunwale@google.com> | Thu Dec 18 17:00:07 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 18 17:00:07 2014 +0000 |
tree | 1430ab282a6ced6b06cd648306d32fbaf2bcbbe4 | |
parent | e37f3af76dc0c876ea7169b9153f79175d0c703d [diff] | |
parent | 07bb03c42343d54d0a8eb609c74eebd9ecd0df9d [diff] |
am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." * commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d': Avoid deadlock between ActivityManagerService and ProcessStatsService.