auto import from //branches/cupcake/...@126645
diff --git a/Android.mk b/Android.mk
index 7c5b34c..a8df511 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,4 +11,6 @@
 
 LOCAL_JAVA_RESOURCE_DIRS := core/res
 
+LOCAL_NO_EMMA_INSTRUMENT := true
+
 include $(BUILD_JAVA_LIBRARY)
diff --git a/core/res/emma_default.properties b/core/res/emma_default.properties
index 8a3079d..bbba41d 100644
--- a/core/res/emma_default.properties
+++ b/core/res/emma_default.properties
@@ -48,7 +48,7 @@
 
 # runtime coverage data output properties:
 
-coverage.out.file:	/data/coverage.ec
+coverage.out.file:	/sdcard/coverage.ec
 coverage.out.merge:	true
 
 # -------------------------------------------------------------