merge from donut
diff --git a/Android.mk b/Android.mk
index a8df511..102f435 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@
 
 LOCAL_MODULE := emma
 
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_JAVA_RESOURCE_DIRS := core/res