Brad Fitzpatrick 39f35f0a62 am 9dde087d: am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb ...

* commit '9dde087dcb94341bd2b66e186534dc44e660a2ce':
  Watchdog can get deadlocked on activity manager

2011-01-14 12:51:57 -08:00

..

com/android/server

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

2011-01-14 12:51:57 -08:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00