tree a390cc6a33d84c0ef53f0b38893416c3db5646b4
parent 312206b98749bbe395416634e6e82bd242b1d5f2
parent 9765c72eeaba9ed0f704dd992e7a954f38f20abd
author Brad Fitzpatrick <bradfitz@android.com> 1295038088 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295038088 -0800

Merge "Watchdog can get deadlocked on activity manager" into honeycomb