am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb

* commit '1e8d23f6b03aeed45cdcf5c03121741ee9684396':
  Watchdog can get deadlocked on activity manager
This commit is contained in:
Brad Fitzpatrick 2011-01-14 12:50:00 -08:00 committed by Android Git Automerger
commit 12494fcf4b

Diff Content Not Available