Brad Fitzpatrick 1e8d23f6b0 Merge "Watchdog can get deadlocked on activity manager" into honeycomb

2011-01-14 12:48:08 -08:00

..

com/android/server

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

2011-01-14 12:48:08 -08:00

Android.mk

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

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