Robert Greenwalt 6b09916eb2 DO NOT MERGE Backport of I1f55df8a from master. ...

Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6

2011-03-10 17:04:21 -08:00

..

com/android/server

DO NOT MERGE Backport of I1f55df8a from master.

2011-03-10 17:04:21 -08:00

Android.mk

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

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